Merge pull request osquery#1510 from marpaia/fix-1504

Only log to warning if the config can't be read by the daemon
olivierh59500 · Sep 16, 2015 · e8d9118 · e8d9118
2 parents 7852c35 + dc6e395
commit e8d9118
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/osquery/core/init.cpp b/osquery/core/init.cpp
@@ -431,7 +431,12 @@ void Initializer::start() {
   // Load the osquery config using the default/active config plugin.
   auto s = Config::getInstance().load();
   if (!s.ok()) {
-    LOG(ERROR) << "Error reading config: " << s.toString();
+    auto message = "Error reading config: " + s.toString();
+    auto severity = google::GLOG_INFO;
+    if (tool_ == OSQUERY_TOOL_DAEMON) {
+      severity = google::GLOG_WARNING;
+    }
+    google::LogMessage(__FILE__, __LINE__, severity, &message);
   }
 
   // Initialize the status and result plugin logger.