Add improved logging to SSL Observatory.

jsha · jsha · commit 68421bc71bc8 · 2014-12-03T13:32:58.000-08:00
diff --git a/https-everywhere-tests/test_profile_skeleton/prefs.js b/https-everywhere-tests/test_profile_skeleton/prefs.js
@@ -5,6 +5,7 @@ user_pref("extensions.https_everywhere._observatory.popup_shown", true);
 user_pref("extensions.https_everywhere.toolbar_hint_shown", true);
 // Show all logs.
 user_pref("extensions.https_everywhere.LogLevel", 0);
+user_pref("extensions.https_everywhere.log_to_stdout", true);
 // Allow running of Mixed Content Blocking tests.
 user_pref("extensions.https_everywhere.show_ruleset_tests", true);
 // Make it quicker to make manual config changes.
diff --git a/src/components/ssl-observatory.js b/src/components/ssl-observatory.js
@@ -1100,13 +1100,15 @@ SSLObservatory.prototype = {
       threshold = WARN;
     }
     if (level >= threshold) {
+      var levelName = ["", "VERB", "DBUG", "INFO", "NOTE", "WARN"][level];
+      var prefix = "SSL Observatory " + 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 (this.prefs.getBoolPref("log_to_stdout")) {
-	dump("SSL Observatory " + level + ": " + str + "\n");
+	dump(prefix + str + "\n");
       }
-      econsole.logStringMessage("SSL Observatory: " +str);
+      econsole.logStringMessage(prefix + str);
     }
   }
 };

Original file line number	Diff line number	Diff line change
`@@ -1100,13 +1100,15 @@ SSLObservatory.prototype = {`
`1100`	`1100`	`threshold = WARN;`
`1101`	`1101`	`}`
`1102`	`1102`	`if (level >= threshold) {`
	`1103`	`+ var levelName = ["", "VERB", "DBUG", "INFO", "NOTE", "WARN"][level];`
	`1104`	`+ var prefix = "SSL Observatory " + levelName + ": ";`
`1103`	`1105`	`// dump() prints to browser stdout. That's sometimes undesireable,`
`1104`	`1106`	`// so only do it when a pref is set (running from test.sh enables`
`1105`	`1107`	`// this pref).`
`1106`	`1108`	`if (this.prefs.getBoolPref("log_to_stdout")) {`
`1107`		`- dump("SSL Observatory " + level + ": " + str + "\n");`
	`1109`	`+ dump(prefix + str + "\n");`
`1108`	`1110`	`}`
`1109`		`- econsole.logStringMessage("SSL Observatory: " +str);`
	`1111`	`+ econsole.logStringMessage(prefix + str);`
`1110`	`1112`	`}`
`1111`	`1113`	`}`
`1112`	`1114`	`};`