Add 'quiet' option to log

This mutes all INFO and NOTICE. Also fixed the parsing of the log_subscriptions.

Add 'quiet' option to log
This mutes all INFO and NOTICE. Also fixed the parsing of the log_subscriptions.
Wiebe Cazemier
1 parent d105ac30
Showing 5 changed files with 18 additions and 5 deletions
configfileparser.cpp
logger.cpp
logger.h
mainapp.cpp
settings.h
@@ -96,6 +96,7 @@ ConfigFileParser::ConfigFileParser(const std::string &amp;path) :
     validKeys.insert("auth_plugin_serialize_auth_checks");
     validKeys.insert("auth_plugin_timer_period");
     validKeys.insert("log_file");
+    validKeys.insert("quiet");
     validKeys.insert("allow_unsafe_clientid_chars");
     validKeys.insert("allow_unsafe_username_chars");
     validKeys.insert("client_initial_buffer_size");
@@ -310,6 +311,12 @@ void ConfigFileParser::loadFile(bool test)
                     tmpSettings->logPath = value;
                 }
+                if (key == "quiet")
+                {
+                    bool tmp = stringTruthiness(value);
+                    tmpSettings->quiet = tmp;
+                }
+
                 if (key == "allow_unsafe_clientid_chars")
                 {
                     bool tmp = stringTruthiness(value);
@@ -157,7 +157,7 @@ void Logger::setLogPath(const std::string &amp;path)
     Logger::logPath = path;
 }
-void Logger::setFlags(bool logDebug, bool logSubscriptions)
+void Logger::setFlags(bool logDebug, bool logSubscriptions, bool quiet)
 {
     if (logDebug)
         curLogLevel |= LOG_DEBUG;
@@ -165,9 +165,14 @@ void Logger::setFlags(bool logDebug, bool logSubscriptions)
         curLogLevel &= ~LOG_DEBUG;
     if (logSubscriptions)
-        curLogLevel |= (LOG_UNSUBSCRIBE & LOG_SUBSCRIBE);
+        curLogLevel |= (LOG_UNSUBSCRIBE | LOG_SUBSCRIBE);
     else
-        curLogLevel &= ~(LOG_UNSUBSCRIBE & LOG_SUBSCRIBE);
+        curLogLevel &= ~(LOG_UNSUBSCRIBE | LOG_SUBSCRIBE);
+
+    if (!quiet)
+        curLogLevel |= (LOG_NOTICE | LOG_INFO);
+    else
+        curLogLevel &= ~(LOG_NOTICE | LOG_INFO);
 }
 void Logger::quit()
@@ -75,7 +75,7 @@ public:
     void noLongerLogToStd();
     void setLogPath(const std::string &path);
-    void setFlags(bool logDebug, bool logSubscriptions);
+    void setFlags(bool logDebug, bool logSubscriptions, bool quiet);
     void quit();
@@ -644,7 +644,7 @@ void MainApp::loadConfig()
     logger->setLogPath(settings->logPath);
     logger->queueReOpen();
-    logger->setFlags(settings->logDebug, settings->logSubscriptions);
+    logger->setFlags(settings->logDebug, settings->logSubscriptions, settings->quiet);
     setlimits();
@@ -35,6 +35,7 @@ public:
     // Actual config options with their defaults.
     std::string authPluginPath;
     std::string logPath;
+    bool quiet = false;
     bool allowUnsafeClientidChars = false;
     bool allowUnsafeUsernameChars = false;
     bool authPluginSerializeInit = false;