diff --git a/common/eqemu_logsys.cpp b/common/eqemu_logsys.cpp index a8b384a37..97ee16a19 100644 --- a/common/eqemu_logsys.cpp +++ b/common/eqemu_logsys.cpp @@ -614,7 +614,7 @@ void EQEmuLogSys::EnableConsoleLogging() std::copy(std::begin(pre_silence_settings), std::end(pre_silence_settings), std::begin(log_settings)); } -EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings() +EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings(bool silent_load) { InjectTablesIfNotExist(); @@ -699,6 +699,10 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings() return this; } + if (silent_load) { + SilenceConsoleLogging(); + } + LogInfo("Loaded [{}] log categories", categories.size()); auto webhooks = DiscordWebhooksRepository::GetWhere(*m_database, fmt::format("id < {}", MAX_DISCORD_WEBHOOK_ID)); @@ -716,6 +720,10 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings() log_settings[Logs::Info].log_to_file = static_cast(Logs::General); log_settings[Logs::Info].log_to_console = static_cast(Logs::General); + if (silent_load) { + SilenceConsoleLogging(); + } + return this; } diff --git a/common/eqemu_logsys.h b/common/eqemu_logsys.h index 02bd89018..a82d19d72 100644 --- a/common/eqemu_logsys.h +++ b/common/eqemu_logsys.h @@ -279,7 +279,7 @@ public: */ void CloseFileLogs(); EQEmuLogSys *LoadLogSettingsDefaults(); - EQEmuLogSys *LoadLogDatabaseSettings(); + EQEmuLogSys *LoadLogDatabaseSettings(bool silent_load = false); /** * @param directory_name diff --git a/zone/main.cpp b/zone/main.cpp index ff68fd010..9e50ea0bd 100644 --- a/zone/main.cpp +++ b/zone/main.cpp @@ -306,7 +306,7 @@ int main(int argc, char **argv) LogSys.SetDatabase(&database) ->SetLogPath(path.GetLogPath()) - ->LoadLogDatabaseSettings() + ->LoadLogDatabaseSettings(ZoneCLI::RanTestCommand(argc, argv)) ->SetGMSayHandler(&Zone::GMSayHookCallBackProcess) ->StartFileLogs();