From 2d6143dce1790da2134aa2e5bd19a50157453738 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 8 Jun 2015 03:03:01 -0400
Subject: [PATCH] Clean up notifier debug output

---
 chrome/content/zotero/xpcom/notifier.js | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/chrome/content/zotero/xpcom/notifier.js b/chrome/content/zotero/xpcom/notifier.js
index 2fcc9ce9ee..17b2c92ea1 100644
--- a/chrome/content/zotero/xpcom/notifier.js
+++ b/chrome/content/zotero/xpcom/notifier.js
@@ -69,7 +69,7 @@ Zotero.Notifier = new function(){
 		}
 		while (_observers[hash]);
 		
-		var msg = "Registering observer '" + hash + "' for "
+		var msg = "Registering notifier observer '" + hash + "' for "
 			+ (types ? '[' + types.join() + ']' : 'all types');
 		if (priority) {
 			msg += " with priority " + priority;
@@ -84,7 +84,7 @@ Zotero.Notifier = new function(){
 	}
 	
 	this.unregisterObserver = function (id) {
-		Zotero.debug("Unregistering observer in notifier with id '" + id + "'", 4);
+		Zotero.debug("Unregistering notifier observer in notifier with id '" + id + "'", 4);
 		delete _observers[id];
 	}
 	
@@ -210,7 +210,6 @@ Zotero.Notifier = new function(){
 				}
 			}
 		}
-		Zotero.debug(_queue[type][event]);
 		
 		return true;
 	}
@@ -221,16 +220,13 @@ Zotero.Notifier = new function(){
 			+ "'" + event + "', "
 			+ "'" + type + "', "
 			+ "[" + ids.join() + "]"
-			+ (extraData ? ", " + extraData : "")
+			+ (extraData ? ", " + JSON.stringify(extraData) : "")
 			+ ")"
 			+ (queueing
 				? " queued "
 				: " called "
 			+ "[observers: " + _countObserversForType(type) + "]")
 		);
-		if (extraData) {
-			Zotero.debug(extraData);
-		}
 	}
 	
 	
@@ -315,7 +311,7 @@ Zotero.Notifier = new function(){
 			//Zotero.debug("Notifier queue already open", 4);
 		}
 		else {
-			Zotero.debug("Beginning Notifier event queue");
+			Zotero.debug("Beginning notifier event queue");
 			_inTransaction = true;
 		}
 		
@@ -386,7 +382,7 @@ Zotero.Notifier = new function(){
 		reset();
 		
 		if (totals) {
-			Zotero.debug("Committing Notifier event queue" + totals);
+			Zotero.debug("Committing notifier event queue" + totals);
 			
 			for (var type in runQueue) {
 				for (var event in runQueue[type]) {
@@ -409,7 +405,7 @@ Zotero.Notifier = new function(){
 	 * Reset the event queue
 	 */
 	function reset() {
-		Zotero.debug("Resetting Notifier event queue");
+		Zotero.debug("Resetting notifier event queue");
 		_locked = false;
 		_queue = [];
 		_inTransaction = false;