Issue #2916 - Restore the ability to set a default log level when using MOZ_LOG

xpcom/base/Logging.cpp

@@ -172,6 +172,7 @@ public:
     , mAddTimestamp(false)
     , mIsSync(false)
     , mRotate(0)
+    , mDefaultLogLevel(LogLevel::Disabled)
   {
   }
 
@@ -190,6 +191,7 @@ public:
     bool addTimestamp = false;
     bool isSync = false;
     int32_t rotate = 0;
+    LogLevel defaultLogLevel = LogLevel::Disabled;
     const char* modules = PR_GetEnv("MOZ_LOG");
     if (!modules || !modules[0]) {
       modules = PR_GetEnv("MOZ_LOG_MODULES");
@@ -207,7 +209,7 @@ public:
     }
 
     NSPRLogModulesParser(modules,
-        [&shouldAppend, &addTimestamp, &isSync, &rotate]
+        [&shouldAppend, &addTimestamp, &isSync, &rotate, &defaultLogLevel]
             (const char* aName, LogLevel aLevel, int32_t aValue) mutable {
           if (strcmp(aName, "append") == 0) {
             shouldAppend = true;
@@ -217,6 +219,8 @@ public:
             isSync = true;
           } else if (strcmp(aName, "rotate") == 0) {
             rotate = (aValue << 20) / kRotateFilesNumber;
+          } else if (strcmp(aName, "all") == 0) {
+            defaultLogLevel = aLevel;
           } else {
             LogModule::Get(aName)->SetLevel(aLevel);
           }
@@ -226,6 +230,7 @@ public:
     mAddTimestamp = addTimestamp || rotate > 0;
     mIsSync = isSync;
     mRotate = rotate;
+    mDefaultLogLevel = defaultLogLevel;
 
     if (rotate > 0 && shouldAppend) {
       NS_WARNING("MOZ_LOG: when you rotate the log, you cannot use append!");
@@ -346,7 +351,7 @@ public:
     OffTheBooksMutexAutoLock guard(mModulesLock);
     LogModule* module = nullptr;
     if (!mModules.Get(aName, &module)) {
-      module = new LogModule(aName, LogLevel::Disabled);
+      module = new LogModule(aName, mDefaultLogLevel);
       mModules.Put(aName, module);
     }
 
@@ -499,6 +504,8 @@ private:
   Atomic<bool, Relaxed> mAddTimestamp;
   Atomic<bool, Relaxed> mIsSync;
   int32_t mRotate;
+
+  Atomic<LogLevel, Relaxed> mDefaultLogLevel;
 };
 
 StaticAutoPtr<LogModuleManager> sLogModuleManager;