Review fixes.

Makefile

@@ -127,10 +127,9 @@ endef
 
 .PHONY: test-deps
 test-deps: node_modules
-	-mkdir -p test-logs
-	-rm logic-inspector/test-logs
-	-ln -s '../test-logs' logic-inspector/test-logs
-	-cd logic-inspector; make; cd ..
+	-mkdir -p logic-inspector/test-logs
+	-ln -s logic-inspector/test-logs
+	-cd logic-inspector; make
 
 # If our package.json has been updated, run npm install
 node_modules: package.json

js/activesync/account.js

@@ -238,7 +238,7 @@ ActiveSyncAccount.prototype = {
   _attachLoggerToConnection: function(conn) {
     logic.defineScope(conn, 'ActiveSyncConnection',
                       { connectionId: logic.uniqueId() });
-    if (logic.isCensored()) {
+    if (logic.isCensored) {
       conn.onmessage = this._onmessage_dangerous.bind(this, conn);
     } else {
       conn.onmessage = this._onmessage_safe.bind(this, conn);
@@ -370,7 +370,6 @@ ActiveSyncAccount.prototype = {
   },
 
   shutdown: function asa_shutdown(callback) {
-    logic(this, 'die');
     if (callback)
       callback();
   },

js/activesync/folder.js

@@ -1482,7 +1482,6 @@ ActiveSyncFolderSyncer.prototype = {
 
   shutdown: function() {
     this.folderConn.shutdown();
-    logic(this, 'die');
   }
 };
 

js/ext/axeshim-browserbox.js

@@ -4,7 +4,7 @@
  */
 define(function(require) {
   var logic = require('logic');
-  var scope = logic.scope('Browserbox');
+  var scope = logic.scope('BrowserBox');
 
   return {
     /**
@@ -19,7 +19,7 @@ define(function(require) {
      * logging slightly.
      */
     debug: function(ignoredTag, msg) {
-      if (logic.isCensored()) {
+      if (!logic.isCensored) {
         logic(scope, 'debug', { msg: msg });
       }
     },

js/ext/axeshim-smtpclient.js

@@ -9,7 +9,7 @@ define(function(require) {
   return {
     // see axeshim-browserbox's comment about '.debug'
     debug: function(ignoredTag, msg) {
-      if (logic.isCensored()) {
+      if (!logic.isCensored) {
         logic(scope, 'debug', { msg: msg });
       }
     },

js/ext/browserbox.js

@@ -2132,4 +2132,4 @@
     }
 
     return BrowserBox;
-}));
+}));

js/ext/mailbuild.js

@@ -727,4 +727,4 @@
     };
 
     return MimeNode;
-}));
+}));

js/ext/mimefuncs.js

@@ -1174,4 +1174,4 @@
     }
 
     return mimefuncs;
-}));
+}));

js/imap/account.js

@@ -673,6 +673,8 @@ var properties = {
       folderPubsByPath[folderPub.path] = folderPub;
     }
 
+    var syncScope = logic.scope('ImapFolderSync');
+
     // - walk the boxes
     function walkBoxes(boxLevel, pathDepth, parentId) {
       boxLevel.forEach(function(box) {
@@ -703,7 +705,7 @@ var properties = {
           meta.name = box.name;
           meta.delim = delim;
 
-          logic(self, 'folder-sync:existing', {
+          logic(syncScope, 'folder-sync:existing', {
             type: type,
             name: box.name,
             path: path,
@@ -715,7 +717,7 @@ var properties = {
         }
         // - new to us!
         else {
-          logic(self, 'folder-sync:add', {
+          logic(syncScope, 'folder-sync:add', {
             type: type,
             name: box.name,
             path: path,
@@ -743,7 +745,7 @@ var properties = {
       // Never delete our localdrafts or outbox folder.
       if ($mailslice.FolderStorage.isTypeLocalOnly(folderPub.type))
         continue;
-      logic(self, 'delete-dead-folder', {
+      logic(syncScope, 'delete-dead-folder', {
         folderType: folderPub.type,
         folderId: folderPub.id
       });
@@ -893,7 +895,6 @@ var properties = {
       }
     }
 
-    logic(this, 'die');
     if (!liveConns && callback)
       callback();
   },

js/imap/folder.js

@@ -1016,7 +1016,6 @@ ImapFolderConn.prototype = {
   },
 
   shutdown: function() {
-    logic(this, 'die');
   },
 };
 
@@ -1514,7 +1513,6 @@ console.log("folder message count", folderMessageCount,
 
   shutdown: function() {
     this.folderConn.shutdown();
-    logic(this, 'die');
   },
 };