Don't log to stdout unless testing.

jsha · jsha · commit 5197662ba106 · 2014-12-02T18:08:05.000-05:00
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
@@ -286,7 +286,7 @@ HTTPSEverywhere.prototype = {
   getExpando: function(browser, key) {
     let obj = this.expandoMap.get(browser);
     if (!obj) {
-      this.log(NOTE, "No expando for " + browser.currentURI);
+      this.log(NOTE, "No expando for " + browser.currentURI.spec);
       return null;
     }
     return obj[key];
@@ -835,8 +835,15 @@ function https_everywhereLog(level, str) {
     threshold = WARN;
   }
   if (level >= threshold) {
-    dump("HTTPS Everywhere: "+str+"\n");
-    econsole.logStringMessage("HTTPS Everywhere: " +str);
+    var levelName = ["", "VERB", "DBUG", "INFO", "NOTE", "WARN"][+level];
+    var prefix = "HTTPS Everywhere " + levelName + ": ";
+    // dump() prints to browser stdout. That's sometimes undesireable,
+    // so only do it when a pref is set (running from test.sh enables
+    // this pref).
+    if (prefs.getBoolPref("log_to_stdout")) {
+      dump(prefix + str + "\n");
+    }
+    econsole.logStringMessage(prefix + str);
   }
 }
 
diff --git a/src/components/ssl-observatory.js b/src/components/ssl-observatory.js
@@ -1100,7 +1100,12 @@ SSLObservatory.prototype = {
       threshold = WARN;
     }
     if (level >= threshold) {
-      dump("SSL Observatory: "+str+"\n");
+      // dump() prints to browser stdout. That's sometimes undesireable,
+      // so only do it when a pref is set (running from test.sh enables
+      // this pref).
+      if (this.prefs.getBoolPref("log_to_stdout")) {
+	dump("SSL Observatory " + level + ": " + str + "\n");
+      }
       econsole.logStringMessage("SSL Observatory: " +str);
     }
   }
diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js
@@ -1,4 +1,5 @@
 pref("extensions.https_everywhere.LogLevel", 5);
+pref("extensions.https_everywhere.log_to_stdout", false);
 pref("extensions.https_everywhere.globalEnabled",true);
 
 // this is the HTTPS Everywhere preferences version (for migrations)

Original file line number	Diff line number	Diff line change
`@@ -1100,7 +1100,12 @@ SSLObservatory.prototype = {`
`1100`	`1100`	`threshold = WARN;`
`1101`	`1101`	`}`
`1102`	`1102`	`if (level >= threshold) {`
`1103`		`- dump("SSL Observatory: "+str+"\n");`
	`1103`	`+ // dump() prints to browser stdout. That's sometimes undesireable,`
	`1104`	`+ // so only do it when a pref is set (running from test.sh enables`
	`1105`	`+ // this pref).`
	`1106`	`+ if (this.prefs.getBoolPref("log_to_stdout")) {`
	`1107`	`+ dump("SSL Observatory " + level + ": " + str + "\n");`
	`1108`	`+ }`
`1104`	`1109`	`econsole.logStringMessage("SSL Observatory: " +str);`
`1105`	`1110`	`}`
`1106`	`1111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`pref("extensions.https_everywhere.LogLevel", 5);`
	`2`	`+pref("extensions.https_everywhere.log_to_stdout", false);`
`2`	`3`	`pref("extensions.https_everywhere.globalEnabled",true);`
`3`	`4`
`4`	`5`	`// this is the HTTPS Everywhere preferences version (for migrations)`