From 7a2e1550f22372510812212c9f7c171d43877896 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Wed, 25 Mar 2015 16:28:18 +1100
Subject: [PATCH] Bug 1146068 (part 2) - fix log manager to automatically set
 log level for all logs under its control. r=adw

---
 services/common/logmanager.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/services/common/logmanager.js b/services/common/logmanager.js
index d814e4b8703..b6e026ea5d5 100644
--- a/services/common/logmanager.js
+++ b/services/common/logmanager.js
@@ -80,7 +80,11 @@ LogManager.prototype = {
       let observer = newVal => {
         let level = Log.Level[newVal] || defaultLevel;
         if (findSmallest) {
-          // We need to find the smallest value from all prefs controlling this appender.
+          // As some of our appenders have global impact (ie, there is only one
+          // place 'dump' goes to), we need to find the smallest value from all
+          // prefs controlling this appender.
+          // For example, if consumerA has dump=Debug then consumerB sets
+          // dump=Error, we need to keep dump=Debug so consumerA is respected.
           for (let branch of allBranches) {
             let lookPrefBranch = new Preferences(branch);
             let lookVal = Log.Level[lookPrefBranch.get(prefName)];
@@ -110,6 +114,12 @@ LogManager.prototype = {
     // now attach the appenders to all our logs.
     for (let logName of logNames) {
       let log = Log.repository.getLogger(logName);
+      // Set all of the logs themselves to log all messages, and rely on the
+      // more restrictive levels on the appenders to restrict what is seen.
+      // (We possibly could find the smallest appender level and set the logs
+      // to that, but that gets tricky when we consider a singe log might end
+      // up being managed by multiple log managers - so this is fine for now.)
+      log.level = Log.Level.All;
       for (let appender of [fapp, dumpAppender, consoleAppender]) {
         log.addAppender(appender);
       }