From cdbd563157f18423111ddb95ff4132f315d274dc Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 16 Aug 2015 00:12:18 +0200 Subject: Core/Logging: Refactored appender creation to allow using logging without mysql dependency in tools (future task) Conflicts: src/server/bnetserver/Main.cpp src/server/worldserver/Main.cpp --- src/server/worldserver/Main.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/server/worldserver/Main.cpp') diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index b3d97d7884c..50ed59a22a1 100644 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -48,6 +48,7 @@ #include "WorldSocket.h" #include "WorldSocketMgr.h" #include "DatabaseLoader.h" +#include "AppenderDB.h" using namespace boost::program_options; @@ -120,11 +121,9 @@ extern int main(int argc, char** argv) return 1; } - if (sConfigMgr->GetBoolDefault("Log.Async.Enable", false)) - { - // If logs are supposed to be handled async then we need to pass the io_service into the Log singleton - Log::instance(&_ioService); - } + sLog->RegisterAppender(); + // If logs are supposed to be handled async then we need to pass the io_service into the Log singleton + sLog->Initialize(sConfigMgr->GetBoolDefault("Log.Async.Enable", false) ? &_ioService : nullptr); TC_LOG_INFO("server.worldserver", "%s (worldserver-daemon)", _FULLVERSION); TC_LOG_INFO("server.worldserver", " to stop.\n"); -- cgit v1.2.3