Implemented special handling for -nodebug flag (#1014)

* Implemented special handling for -nodebug flag
firoorg · Apr 27, 2021 · 2ec9860 · 2ec9860
1 parent e0bc12b
commit 2ec9860
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/init.cpp b/src/init.cpp
@@ -1207,8 +1207,10 @@ bool AppInitParameterInteraction()
     // Special-case: if -debug=0/-nodebug is set, turn off debugging messages
     if (fDebug) {
         const std::vector<std::string>& categories = mapMultiArgs.at("-debug");
-        if (GetBoolArg("-nodebug", false) || find(categories.begin(), categories.end(), std::string("0")) != categories.end())
+        if (GetBoolArg("-nodebug", false) || find(categories.begin(), categories.end(), std::string("0")) != categories.end()) {
             fDebug = false;
+            fNoDebug = true;
+        }
     }
 
     // Check for -debugnet

diff --git a/src/util.cpp b/src/util.cpp
@@ -121,6 +121,7 @@ const map<string, vector<string> >& mapMultiArgs = _mapMultiArgs;
 bool fDebug = false;
 bool fPrintToConsole = false;
 bool fPrintToDebugLog = true;
+bool fNoDebug = false; //A temporary fix for https://github.com/firoorg/firo/issues/1011
 
 bool fLogTimestamps = DEFAULT_LOGTIMESTAMPS;
 bool fLogTimeMicros = DEFAULT_LOGTIMEMICROS;
@@ -308,6 +309,10 @@ static std::string LogTimestampStr(const std::string &str, std::atomic_bool *fSt
 
 int LogPrintStr(const std::string &str)
 {
+    //A temporary fix for https://github.com/firoorg/firo/issues/1011
+    if (fNoDebug && str.compare(0, 6, "ERROR:", 0, 6) != 0)
+        return 0;
+
     int ret = 0; // Returns total number of characters written
     static std::atomic_bool fStartedNewLine(true);
 

diff --git a/src/util.h b/src/util.h
@@ -56,6 +56,7 @@ extern const std::map<std::string, std::vector<std::string> >& mapMultiArgs;
 extern bool fDebug;
 extern bool fPrintToConsole;
 extern bool fPrintToDebugLog;
+extern bool fNoDebug;
 
 extern bool fLogTimestamps;
 extern bool fLogTimeMicros;