mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-13 14:41:28 +00:00
Rename LoadLogSysSettings to LoadLogSettings
This commit is contained in:
parent
43a9a4742c
commit
46010fbfdf
@ -56,7 +56,7 @@ int main(int argc, char **argv) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Register Log System and Settings */
|
/* Register Log System and Settings */
|
||||||
database.LoadLogSysSettings(Log.log_settings);
|
database.LoadLogSettings(Log.log_settings);
|
||||||
Log.StartFileLogs();
|
Log.StartFileLogs();
|
||||||
|
|
||||||
ExportSpells(&database);
|
ExportSpells(&database);
|
||||||
|
|||||||
@ -53,7 +53,7 @@ int main(int argc, char **argv) {
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
database.LoadLogSysSettings(Log.log_settings);
|
database.LoadLogSettings(Log.log_settings);
|
||||||
Log.StartFileLogs();
|
Log.StartFileLogs();
|
||||||
|
|
||||||
ImportSpells(&database);
|
ImportSpells(&database);
|
||||||
|
|||||||
@ -4159,7 +4159,7 @@ uint32 Database::GetGuildIDByCharID(uint32 char_id)
|
|||||||
return atoi(row[0]);
|
return atoi(row[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Database::LoadLogSysSettings(EQEmuLogSys::LogSettings* log_settings){
|
void Database::LoadLogSettings(EQEmuLogSys::LogSettings* log_settings){
|
||||||
std::string query =
|
std::string query =
|
||||||
"SELECT "
|
"SELECT "
|
||||||
"log_category_id, "
|
"log_category_id, "
|
||||||
|
|||||||
@ -646,7 +646,7 @@ public:
|
|||||||
void AddReport(std::string who, std::string against, std::string lines);
|
void AddReport(std::string who, std::string against, std::string lines);
|
||||||
|
|
||||||
/* EQEmuLogSys */
|
/* EQEmuLogSys */
|
||||||
void LoadLogSysSettings(EQEmuLogSys::LogSettings* log_settings);
|
void LoadLogSettings(EQEmuLogSys::LogSettings* log_settings);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void DBInitVars();
|
void DBInitVars();
|
||||||
|
|||||||
@ -364,7 +364,7 @@ void Database::GeneralQueryReceive(ServerPacket *pack) {
|
|||||||
safe_delete(queryBuffer);
|
safe_delete(queryBuffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Database::LoadLogSysSettings(EQEmuLogSys::LogSettings* log_settings){
|
void Database::LoadLogSettings(EQEmuLogSys::LogSettings* log_settings){
|
||||||
std::string query =
|
std::string query =
|
||||||
"SELECT "
|
"SELECT "
|
||||||
"log_category_id, "
|
"log_category_id, "
|
||||||
|
|||||||
@ -52,7 +52,7 @@ public:
|
|||||||
void LogMerchantTransaction(QSMerchantLogTransaction_Struct* QS, uint32 Items);
|
void LogMerchantTransaction(QSMerchantLogTransaction_Struct* QS, uint32 Items);
|
||||||
void GeneralQueryReceive(ServerPacket *pack);
|
void GeneralQueryReceive(ServerPacket *pack);
|
||||||
|
|
||||||
void LoadLogSysSettings(EQEmuLogSys::LogSettings* log_settings);
|
void LoadLogSettings(EQEmuLogSys::LogSettings* log_settings);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void HandleMysqlError(uint32 errnum);
|
void HandleMysqlError(uint32 errnum);
|
||||||
|
|||||||
@ -88,7 +88,7 @@ int main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Register Log System and Settings */
|
/* Register Log System and Settings */
|
||||||
database.LoadLogSysSettings(Log.log_settings);
|
database.LoadLogSettings(Log.log_settings);
|
||||||
Log.StartFileLogs();
|
Log.StartFileLogs();
|
||||||
|
|
||||||
if (signal(SIGINT, CatchSignal) == SIG_ERR) {
|
if (signal(SIGINT, CatchSignal) == SIG_ERR) {
|
||||||
|
|||||||
@ -58,7 +58,7 @@ int main(int argc, char **argv) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Register Log System and Settings */
|
/* Register Log System and Settings */
|
||||||
database.LoadLogSysSettings(Log.log_settings);
|
database.LoadLogSettings(Log.log_settings);
|
||||||
Log.StartFileLogs();
|
Log.StartFileLogs();
|
||||||
|
|
||||||
bool load_all = true;
|
bool load_all = true;
|
||||||
|
|||||||
@ -578,7 +578,7 @@ void Database::GetFriendsAndIgnore(int charID, std::vector<std::string> &friends
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Database::LoadLogSysSettings(EQEmuLogSys::LogSettings* log_settings){
|
void Database::LoadLogSettings(EQEmuLogSys::LogSettings* log_settings){
|
||||||
std::string query =
|
std::string query =
|
||||||
"SELECT "
|
"SELECT "
|
||||||
"log_category_id, "
|
"log_category_id, "
|
||||||
|
|||||||
@ -58,7 +58,7 @@ public:
|
|||||||
void AddFriendOrIgnore(int CharID, int Type, std::string Name);
|
void AddFriendOrIgnore(int CharID, int Type, std::string Name);
|
||||||
void RemoveFriendOrIgnore(int CharID, int Type, std::string Name);
|
void RemoveFriendOrIgnore(int CharID, int Type, std::string Name);
|
||||||
void GetFriendsAndIgnore(int CharID, std::vector<std::string> &Friends, std::vector<std::string> &Ignorees);
|
void GetFriendsAndIgnore(int CharID, std::vector<std::string> &Friends, std::vector<std::string> &Ignorees);
|
||||||
void LoadLogSysSettings(EQEmuLogSys::LogSettings* log_settings);
|
void LoadLogSettings(EQEmuLogSys::LogSettings* log_settings);
|
||||||
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|||||||
@ -98,7 +98,7 @@ int main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Register Log System and Settings */
|
/* Register Log System and Settings */
|
||||||
database.LoadLogSysSettings(Log.log_settings);
|
database.LoadLogSettings(Log.log_settings);
|
||||||
Log.StartFileLogs();
|
Log.StartFileLogs();
|
||||||
|
|
||||||
char tmp[64];
|
char tmp[64];
|
||||||
|
|||||||
@ -184,7 +184,7 @@ int main(int argc, char** argv) {
|
|||||||
guild_mgr.SetDatabase(&database);
|
guild_mgr.SetDatabase(&database);
|
||||||
|
|
||||||
/* Register Log System and Settings */
|
/* Register Log System and Settings */
|
||||||
database.LoadLogSysSettings(Log.log_settings);
|
database.LoadLogSettings(Log.log_settings);
|
||||||
Log.StartFileLogs();
|
Log.StartFileLogs();
|
||||||
|
|
||||||
if (argc >= 2) {
|
if (argc >= 2) {
|
||||||
|
|||||||
@ -794,7 +794,7 @@ bool ZoneServer::Process() {
|
|||||||
}
|
}
|
||||||
case ServerOP_ReloadLogs: {
|
case ServerOP_ReloadLogs: {
|
||||||
zoneserver_list.SendPacket(pack);
|
zoneserver_list.SendPacket(pack);
|
||||||
database.LoadLogSysSettings(Log.log_settings);
|
database.LoadLogSettings(Log.log_settings);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ServerOP_ReloadRules: {
|
case ServerOP_ReloadRules: {
|
||||||
|
|||||||
@ -168,7 +168,7 @@ int main(int argc, char** argv) {
|
|||||||
|
|
||||||
/* Register Log System and Settings */
|
/* Register Log System and Settings */
|
||||||
Log.OnLogHookCallBackZone(&Zone::GMSayHookCallBackProcess);
|
Log.OnLogHookCallBackZone(&Zone::GMSayHookCallBackProcess);
|
||||||
database.LoadLogSysSettings(Log.log_settings);
|
database.LoadLogSettings(Log.log_settings);
|
||||||
Log.StartFileLogs();
|
Log.StartFileLogs();
|
||||||
|
|
||||||
/* Guilds */
|
/* Guilds */
|
||||||
|
|||||||
@ -1749,7 +1749,7 @@ void WorldServer::Process() {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ServerOP_ReloadLogs: {
|
case ServerOP_ReloadLogs: {
|
||||||
database.LoadLogSysSettings(Log.log_settings);
|
database.LoadLogSettings(Log.log_settings);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case ServerOP_CameraShake:
|
case ServerOP_CameraShake:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user