diff --git a/common/dbcore.cpp b/common/dbcore.cpp index d1ae89d32..948490c7c 100644 --- a/common/dbcore.cpp +++ b/common/dbcore.cpp @@ -110,10 +110,6 @@ MySQLRequestResult DBcore::QueryDatabase(const char* query, uint32 querylen, boo char *errorBuffer = new char[MYSQL_ERRMSG_SIZE]; snprintf(errorBuffer, MYSQL_ERRMSG_SIZE, "#%i: %s", mysql_errno(&mysql), mysql_error(&mysql)); -#ifdef _EQDEBUG - std::cout << "DB Query Error #" << mysql_errno(&mysql) << ": " << mysql_error(&mysql) << std::endl; -#endif - /* Implement Logging at the Root */ if (mysql_errno(&mysql) > 0 && strlen(query) > 0){ Log.Out(Logs::General, Logs::MySQLError, "%i: %s \n %s", mysql_errno(&mysql), mysql_error(&mysql), query); diff --git a/world/net.cpp b/world/net.cpp index a4e560477..d78aeecf7 100644 --- a/world/net.cpp +++ b/world/net.cpp @@ -113,7 +113,6 @@ void CatchSignal(int sig_num); int main(int argc, char** argv) { RegisterExecutablePlatform(ExePlatformWorld); - Log.LoadLogSettingsDefaults(); set_exception_handler(); /* Database Version Check */ @@ -183,6 +182,9 @@ int main(int argc, char** argv) { } guild_mgr.SetDatabase(&database); + Log.LoadLogSettingsDefaults(); + database.LoadLogSysSettings(Log.log_settings); + if (argc >= 2) { char tmp[2]; if (strcasecmp(argv[1], "help") == 0 || strcasecmp(argv[1], "?") == 0 || strcasecmp(argv[1], "/?") == 0 || strcasecmp(argv[1], "-?") == 0 || strcasecmp(argv[1], "-h") == 0 || strcasecmp(argv[1], "-help") == 0) { @@ -446,21 +448,13 @@ int main(int argc, char** argv) { //check for timeouts in other threads timeout_manager.CheckTimeouts(); - loginserverlist.Process(); - console_list.Process(); - zoneserver_list.Process(); - launcher_list.Process(); - UCSLink.Process(); - QSLink.Process(); - - LFPGroupList.Process(); - + LFPGroupList.Process(); adventure_manager.Process(); if (InterserverTimer.Check()) { diff --git a/zone/net.cpp b/zone/net.cpp index 579f9d342..8fe7f2a74 100644 --- a/zone/net.cpp +++ b/zone/net.cpp @@ -168,7 +168,7 @@ int main(int argc, char** argv) { /* Register Log System and Settings */ Log.LoadLogSettingsDefaults(); Log.OnLogHookCallBackZone(&Zone::GMSayHookCallBackProcess); - database.LoadLogSysSettings(Log.log_settings); + database.LoadLogSysSettings(Log.log_settings); /* Guilds */ guild_mgr.SetDatabase(&database);