diff --git a/client_files/export/main.cpp b/client_files/export/main.cpp index 550446cb2..18136fcf4 100644 --- a/client_files/export/main.cpp +++ b/client_files/export/main.cpp @@ -35,7 +35,7 @@ void ExportBaseData(SharedDatabase *db); int main(int argc, char **argv) { RegisterExecutablePlatform(ExePlatformClientExport); - logger.LoadLogSettings(); + logger.LoadLogSettingsDefaults(); set_exception_handler(); logger.Log(EQEmuLogSys::Status, "Client Files Export Utility"); diff --git a/client_files/import/main.cpp b/client_files/import/main.cpp index 381889d93..492e7b901 100644 --- a/client_files/import/main.cpp +++ b/client_files/import/main.cpp @@ -33,7 +33,7 @@ void ImportBaseData(SharedDatabase *db); int main(int argc, char **argv) { RegisterExecutablePlatform(ExePlatformClientImport); - logger.LoadLogSettings(); + logger.LoadLogSettingsDefaults(); set_exception_handler(); logger.Log(EQEmuLogSys::Status, "Client Files Import Utility"); diff --git a/common/eqemu_logsys.cpp b/common/eqemu_logsys.cpp index 5b13438d1..61f4f81bd 100644 --- a/common/eqemu_logsys.cpp +++ b/common/eqemu_logsys.cpp @@ -89,7 +89,7 @@ EQEmuLogSys::EQEmuLogSys(){ EQEmuLogSys::~EQEmuLogSys(){ } -void EQEmuLogSys::LoadLogSettings() +void EQEmuLogSys::LoadLogSettingsDefaults() { log_platform = GetExecutablePlatformInt(); std::cout << "PLATFORM " << log_platform << std::endl; diff --git a/common/eqemu_logsys.h b/common/eqemu_logsys.h index 669d06ea9..29315c74c 100644 --- a/common/eqemu_logsys.h +++ b/common/eqemu_logsys.h @@ -75,7 +75,7 @@ public: void CloseFileLogs(); - void LoadLogSettings(); + void LoadLogSettingsDefaults(); void Log(uint16 log_type, const std::string message, ...); void LogDebug(DebugLevel debug_level, std::string message, ...); void LogDebugType(DebugLevel debug_level, uint16 log_category, std::string message, ...); diff --git a/eqlaunch/eqlaunch.cpp b/eqlaunch/eqlaunch.cpp index 11ad0686f..861f536fa 100644 --- a/eqlaunch/eqlaunch.cpp +++ b/eqlaunch/eqlaunch.cpp @@ -39,7 +39,7 @@ void CatchSignal(int sig_num); int main(int argc, char *argv[]) { RegisterExecutablePlatform(ExePlatformLaunch); - logger.LoadLogSettings(); + logger.LoadLogSettingsDefaults(); set_exception_handler(); std::string launcher_name; diff --git a/queryserv/queryserv.cpp b/queryserv/queryserv.cpp index a64ce9be8..25b033a24 100644 --- a/queryserv/queryserv.cpp +++ b/queryserv/queryserv.cpp @@ -50,7 +50,7 @@ void CatchSignal(int sig_num) { int main() { RegisterExecutablePlatform(ExePlatformQueryServ); - logger.LoadLogSettings(); + logger.LoadLogSettingsDefaults(); set_exception_handler(); Timer LFGuildExpireTimer(60000); Timer InterserverTimer(INTERSERVER_TIMER); // does auto-reconnect diff --git a/shared_memory/main.cpp b/shared_memory/main.cpp index 333d5789c..e8d7ec8b9 100644 --- a/shared_memory/main.cpp +++ b/shared_memory/main.cpp @@ -37,7 +37,7 @@ EQEmuLogSys logger; int main(int argc, char **argv) { RegisterExecutablePlatform(ExePlatformSharedMemory); - logger.LoadLogSettings(); + logger.LoadLogSettingsDefaults(); set_exception_handler(); logger.Log(EQEmuLogSys::Status, "Shared Memory Loader Program"); diff --git a/ucs/ucs.cpp b/ucs/ucs.cpp index 2af41f71d..74f7c0522 100644 --- a/ucs/ucs.cpp +++ b/ucs/ucs.cpp @@ -69,7 +69,7 @@ std::string GetMailPrefix() { int main() { RegisterExecutablePlatform(ExePlatformUCS); - logger.LoadLogSettings(); + logger.LoadLogSettingsDefaults(); set_exception_handler(); // Check every minute for unused channels we can delete diff --git a/world/net.cpp b/world/net.cpp index 6f3d85f5e..64a0b973b 100644 --- a/world/net.cpp +++ b/world/net.cpp @@ -113,7 +113,7 @@ void CatchSignal(int sig_num); int main(int argc, char** argv) { RegisterExecutablePlatform(ExePlatformWorld); - logger.LoadLogSettings(); + logger.LoadLogSettingsDefaults(); set_exception_handler(); /* Database Version Check */ diff --git a/zone/net.cpp b/zone/net.cpp index 8d18daba1..64c741ffc 100644 --- a/zone/net.cpp +++ b/zone/net.cpp @@ -174,7 +174,7 @@ int main(int argc, char** argv) { } /* Register Log System and Settings */ - logger.LoadLogSettings(); + logger.LoadLogSettingsDefaults(); logger.OnLogHookCallBackZone(&ClientLogs::ClientMessage); database.LoadLogSysSettings(logger.log_settings);