diff options
| author | Wyrserth <43747507+Wyrserth@users.noreply.github.com> | 2019-05-26 23:01:50 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-08 21:55:04 +0100 |
| commit | 2344671af5dfd15db980b81b5c433d50c718970f (patch) | |
| tree | be0f43e2093e456de1dd6416411f9e428274dc50 | |
| parent | 09fe78dd59095fa31b83a846d5fcbb53dd3afb1b (diff) | |
Core/Console: start CliRunnable thread after all log messages have been printed. (#23321)
(cherry picked from commit d8ce37e0c90a3da2d42a09d33523e4403aab2723)
| -rw-r--r-- | src/server/worldserver/Main.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index 1ed4ade155e..2f6cf319c8a 100644 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -317,17 +317,6 @@ extern int main(int argc, char** argv) ClearOnlineAccounts(); }); - // Launch CliRunnable thread - std::shared_ptr<std::thread> cliThread; -#ifdef _WIN32 - if (sConfigMgr->GetBoolDefault("Console.Enable", true) && (m_ServiceStatus == -1)/* need disable console in service mode*/) -#else - if (sConfigMgr->GetBoolDefault("Console.Enable", true)) -#endif - { - cliThread.reset(new std::thread(CliThread), &ShutdownCLIThread); - } - // Set server online (allow connecting now) LoginDatabase.DirectPExecute("UPDATE realmlist SET flag = flag & ~%u, population = 0 WHERE id = '%u'", REALM_FLAG_OFFLINE, realm.Id.Realm); realm.PopulationLevel = 0.0f; @@ -346,6 +335,17 @@ extern int main(int argc, char** argv) TC_LOG_INFO("server.worldserver", "%s (worldserver-daemon) ready...", GitRevision::GetFullVersion()); + // Launch CliRunnable thread + std::shared_ptr<std::thread> cliThread; +#ifdef _WIN32 + if (sConfigMgr->GetBoolDefault("Console.Enable", true) && (m_ServiceStatus == -1)/* need disable console in service mode*/) +#else + if (sConfigMgr->GetBoolDefault("Console.Enable", true)) +#endif + { + cliThread.reset(new std::thread(CliThread), &ShutdownCLIThread); + } + WorldUpdateLoop(); // Shutdown starts here |