2 files changed, 14 insertions, 6 deletions
diff --git a/src/common/Logging/Log.cpp b/src/common/Logging/Log.cpp
index fb5b9165235..dff0351d52d 100644
--- a/src/common/Logging/Log.cpp
+++ b/src/common/Logging/Log.cpp
@@ -215,13 +215,13 @@ void Log::ReadLoggersFromConfig()
         AppenderConsole* appender = new AppenderConsole(NextAppenderId(), "Console", LOG_LEVEL_DEBUG, APPENDER_FLAGS_NONE, ExtraAppenderArgs());
         appenders[appender->getId()] = appender;
 
-        Logger& logger = loggers[LOGGER_ROOT];
-        logger.Create(LOGGER_ROOT, LOG_LEVEL_ERROR);
-        logger.addAppender(appender->getId(), appender);
+        Logger& rootLogger = loggers[LOGGER_ROOT];
+        rootLogger.Create(LOGGER_ROOT, LOG_LEVEL_ERROR);
+        rootLogger.addAppender(appender->getId(), appender);
 
-        logger = loggers["server"];
-        logger.Create("server", LOG_LEVEL_ERROR);
-        logger.addAppender(appender->getId(), appender);
+        Logger& serverLogger = loggers["server"];
+        serverLogger.Create("server", LOG_LEVEL_INFO);
+        serverLogger.addAppender(appender->getId(), appender);
     }
 }
 
@@ -332,6 +332,13 @@ void Log::Initialize(boost::asio::io_service* ioService)
     LoadFromConfig();
 }
 
+void Log::SetSynchronous()
+{
+    delete _strand;
+    _strand = nullptr;
+    _ioService = nullptr;
+}
+
 void Log::LoadFromConfig()
 {
     Close();
diff --git a/src/common/Logging/Log.h b/src/common/Logging/Log.h
index a90481ad5d2..eafd7412a94 100644
--- a/src/common/Logging/Log.h
+++ b/src/common/Logging/Log.h
@@ -51,6 +51,7 @@ class Log
         }
 
         void Initialize(boost::asio::io_service* ioService);
+        void SetSynchronous();  // Not threadsafe - should only be called from main() after all threads are joined
         void LoadFromConfig();
         void Close();
         bool ShouldLog(std::string const& type, LogLevel level) const;