mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-21 09:44:45 +01:00
Core/Logging: Force synchronous logging after io_service shutdown - fixes logging on worldserver shutdown
(cherry picked from commit a0b2be6c1d)
This commit is contained in:
@@ -337,6 +337,13 @@ void Log::Initialize(boost::asio::io_service* ioService)
|
||||
LoadFromConfig();
|
||||
}
|
||||
|
||||
void Log::SetSynchronous()
|
||||
{
|
||||
delete _strand;
|
||||
_strand = nullptr;
|
||||
_ioService = nullptr;
|
||||
}
|
||||
|
||||
void Log::LoadFromConfig()
|
||||
{
|
||||
Close();
|
||||
|
||||
@@ -47,6 +47,7 @@ class Log
|
||||
static Log* instance();
|
||||
|
||||
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;
|
||||
|
||||
@@ -248,6 +248,8 @@ extern int main(int argc, char** argv)
|
||||
// Shutdown starts here
|
||||
ShutdownThreadPool(threadPool);
|
||||
|
||||
sLog->SetSynchronous();
|
||||
|
||||
sScriptMgr->OnShutdown();
|
||||
|
||||
sIpcContext->Close();
|
||||
|
||||
Reference in New Issue
Block a user