Bug 760906: Enable logging for AITC; r=gps

services/aitc/Aitc.js

@@ -75,9 +75,18 @@ AitcService.prototype = {
 
   start: function start() {
     Cu.import("resource://services-aitc/main.js");
-    if (!this.aitc) {
-      this.aitc = new Aitc();
+    if (this.aitc) {
+      return;
     }
+
+    // Log to stdout if enabled.
+    Cu.import("resource://services-common/log4moz.js");
+    let root = Log4Moz.repository.getLogger("Service.AITC");
+    root.level = Log4Moz.Level[Preferences.get("services.aitc.log.level")];
+    if (Preferences.get("services.aitc.log.dump")) {
+      root.addAppender(new Log4Moz.DumpAppender());
+    }
+    this.aitc = new Aitc();
   },
 
   hasUsedApps: function hasUsedApps() {

services/aitc/modules/browserid.js

@@ -22,7 +22,7 @@ const PREFS = new Preferences("services.aitc.browserid.");
  * generation goodness. See bug 753238.
  */
 function BrowserIDService() {
-  this._log = Log4Moz.repository.getLogger("Services.BrowserID");
+  this._log = Log4Moz.repository.getLogger("Service.AITC.BrowserID");
   this._log.level = Log4Moz.Level[PREFS.get("log")];
 }
 BrowserIDService.prototype = {

services/aitc/services-aitc.js

@@ -1,3 +1,7 @@
+// Root logger
+pref("services.aitc.log.dump", false);
+pref("services.aitc.log.level", "All");
+
 pref("services.aitc.browserid.url", "https://browserid.org/sign_in");
 pref("services.aitc.browserid.log.level", "Debug");
 
@@ -17,7 +21,7 @@ pref("services.aitc.marketplace.url", "https://marketplace.mozilla.org");
 
 pref("services.aitc.service.log.level", "Debug");
 
-// Temporary value. Change to the production server when we get the OK from server ops
+// TODO: Temporary value. Change to the production server (bug 760903)
 pref("services.aitc.tokenServer.url", "https://stage-token.services.mozilla.com");
 
 pref("services.aitc.storage.log.level", "Debug");