From 32c3d179be4bbd561c06e81848e95d0bd7ab8a3b Mon Sep 17 00:00:00 2001
From: Honza Bambas <honzab.moz@firemni.cz>
Date: Thu, 10 Mar 2016 08:22:00 -0500
Subject: [PATCH] Bug 1248565 - Introduce MOZ_LOG_* variables for mozilla
 logging. r=erahm

---
 xpcom/base/Logging.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/xpcom/base/Logging.cpp b/xpcom/base/Logging.cpp
index 2d44d152ee02..36eba7589d3f 100644
--- a/xpcom/base/Logging.cpp
+++ b/xpcom/base/Logging.cpp
@@ -122,7 +122,11 @@ public:
     bool shouldAppend = false;
     bool addTimestamp = false;
     bool isSync = false;
-    const char* modules = PR_GetEnv("NSPR_LOG_MODULES");
+    const char* modules = PR_GetEnv("MOZ_LOG_MODULES");
+    if (!modules || !modules[0]) {
+      modules = PR_GetEnv("NSPR_LOG_MODULES");
+    }
+
     NSPRLogModulesParser(modules,
         [&shouldAppend, &addTimestamp, &isSync]
             (const char* aName, LogLevel aLevel) mutable {
@@ -140,7 +144,11 @@ public:
     mAddTimestamp = addTimestamp;
     mIsSync = isSync;
 
-    const char* logFile = PR_GetEnv("NSPR_LOG_FILE");
+    const char* logFile = PR_GetEnv("MOZ_LOG_FILE");
+    if (!logFile || !logFile[0]) {
+      logFile = PR_GetEnv("NSPR_LOG_FILE");
+    }
+
     if (logFile && logFile[0]) {
       static const char kPIDToken[] = "%PID";
       const char* pidTokenPtr = strstr(logFile, kPIDToken);