From de13bf426e162ee10cbd5470cec74122d1d4afa0 Mon Sep 17 00:00:00 2001 From: Kargatum Date: Sat, 5 Feb 2022 06:37:11 +0700 Subject: feat(Core/DBLayer): replace `char const*` to `std::string_view` (#10211) * feat(Core/DBLayer): replace `char const*` to `std::string_view` * CString * 1 * chore(Core/Misc): code cleanup * cl * db fix * fmt style sql * to fmt * py * del old * 1 * 2 * 3 * 1 * 1 --- src/server/database/Database/DatabaseLoader.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'src/server/database/Database/DatabaseLoader.cpp') diff --git a/src/server/database/Database/DatabaseLoader.cpp b/src/server/database/Database/DatabaseLoader.cpp index db5ad9e20d..5ca5844e3c 100644 --- a/src/server/database/Database/DatabaseLoader.cpp +++ b/src/server/database/Database/DatabaseLoader.cpp @@ -68,7 +68,7 @@ DatabaseLoader& DatabaseLoader::AddDatabase(DatabaseWorkerPool& pool, std::st while (reconnectCount < attempts) { - LOG_INFO(_logger, "> Retrying after {} seconds", static_cast(reconnectSeconds.count())); + LOG_WARN(_logger, "> Retrying after {} seconds", static_cast(reconnectSeconds.count())); std::this_thread::sleep_for(reconnectSeconds); error = pool.Open(); @@ -153,7 +153,22 @@ DatabaseLoader& DatabaseLoader::AddDatabase(DatabaseWorkerPool& pool, std::st bool DatabaseLoader::Load() { - return OpenDatabases() && PopulateDatabases() && UpdateDatabases() && PrepareStatements(); + if (!_updateFlags) + LOG_INFO("sql.updates", "Automatic database updates are disabled for all databases!"); + + if (!OpenDatabases()) + return false; + + if (!PopulateDatabases()) + return false; + + if (!UpdateDatabases()) + return false; + + if (!PrepareStatements()) + return false; + + return true; } bool DatabaseLoader::OpenDatabases() -- cgit v1.2.3