pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-15 00:01:28 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Logging] Simplify Log Settings Initialization (#1394)

Browse Source 
* Simplify logging loading

* Fix log injections and reduce verbosity
This commit is contained in:
Chris Miles 2021-06-13 18:06:43 -05:00 committed by GitHub
parent 0e4361955d
commit bcb0e43d13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 154 additions and 481 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client_files/export/main.cpp
View File

@ -83,8 +83,9 @@ int main(int argc, char **argv)
content_db.SetMysql(database.getMySQL()); content_db.SetMysql(database.getMySQL());
} }
database.LoadLogSettings(LogSys.log_settings); LogSys.SetDatabase(&database)
LogSys.StartFileLogs(); ->LoadLogDatabaseSettings()
->StartFileLogs();
std::string arg_1; std::string arg_1;

5
client_files/import/main.cpp
View File

@ -80,8 +80,9 @@ int main(int argc, char **argv) {
content_db.SetMysql(database.getMySQL()); content_db.SetMysql(database.getMySQL());
} }
database.LoadLogSettings(LogSys.log_settings); LogSys.SetDatabase(&database)
LogSys.StartFileLogs(); ->LoadLogDatabaseSettings()
->StartFileLogs();
ImportSpells(&content_db); ImportSpells(&content_db);
ImportSkillCaps(&content_db); ImportSkillCaps(&content_db);

89
common/database.cpp
View File

@ -2191,95 +2191,6 @@ uint32 Database::GetRaidIDByCharID(uint32 character_id) {
return 0; return 0;
} }
/**
* @param log_settings
*/
void Database::LoadLogSettings(EQEmuLogSys::LogSettings *log_settings)
{
std::string query =
"SELECT "
"log_category_id, "
"log_category_description, "
"log_to_console, "
"log_to_file, "
"log_to_gmsay "
"FROM "
"logsys_categories "
"ORDER BY log_category_id";
auto results = QueryDatabase(query);
int log_category_id = 0;
int *categories_in_database = new int[1000];
for (auto row = results.begin(); row != results.end(); ++row) {
log_category_id = atoi(row[0]);
if (log_category_id <= Logs::None || log_category_id >= Logs::MaxCategoryID) {
continue;
}
log_settings[log_category_id].log_to_console = static_cast<uint8>(atoi(row[2]));
log_settings[log_category_id].log_to_file = static_cast<uint8>(atoi(row[3]));
log_settings[log_category_id].log_to_gmsay = static_cast<uint8>(atoi(row[4]));
/**
* Determine if any output method is enabled for the category
* and set it to 1 so it can used to check if category is enabled
*/
const bool log_to_console = log_settings[log_category_id].log_to_console > 0;
const bool log_to_file = log_settings[log_category_id].log_to_file > 0;
const bool log_to_gmsay = log_settings[log_category_id].log_to_gmsay > 0;
const bool is_category_enabled = log_to_console || log_to_file || log_to_gmsay;
if (is_category_enabled) {
log_settings[log_category_id].is_category_enabled = 1;
}
/**
* This determines whether or not the process needs to actually file log anything.
* If we go through this whole loop and nothing is set to any debug level, there is no point to create a file or keep anything open
*/
if (log_settings[log_category_id].log_to_file > 0) {
LogSys.file_logs_enabled = true;
}
categories_in_database[log_category_id] = 1;
}
/**
* Auto inject categories that don't exist in the database...
*/
for (int log_index = Logs::AA; log_index != Logs::MaxCategoryID; log_index++) {
if (categories_in_database[log_index] != 1) {
LogInfo(
"New Log Category [{0}] doesn't exist... Automatically adding to [logsys_categories] table...",
Logs::LogCategoryName[log_index]
);
auto inject_query = fmt::format(
"INSERT INTO logsys_categories "
"(log_category_id, "
"log_category_description, "
"log_to_console, "
"log_to_file, "
"log_to_gmsay) "
"VALUES "
"({0}, '{1}', {2}, {3}, {4})",
log_index,
EscapeString(Logs::LogCategoryName[log_index]),
std::to_string(log_settings[log_index].log_to_console),
std::to_string(log_settings[log_index].log_to_file),
std::to_string(log_settings[log_index].log_to_gmsay)
);
QueryDatabase(inject_query);
}
}
delete[] categories_in_database;
}
int Database::CountInvSnapshots() { int Database::CountInvSnapshots() {
std::string query = StringFormat("SELECT COUNT(*) FROM (SELECT * FROM `inventory_snapshots` a GROUP BY `charid`, `time_index`) b"); std::string query = StringFormat("SELECT COUNT(*) FROM (SELECT * FROM `inventory_snapshots` a GROUP BY `charid`, `time_index`) b");
auto results = QueryDatabase(query); auto results = QueryDatabase(query);

3
common/database.h
View File

@ -78,6 +78,7 @@ class PTimerList;
#define SQL(...) #__VA_ARGS__ #define SQL(...) #__VA_ARGS__
class LogSettings;
class Database : public DBcore { class Database : public DBcore {
public: public:
Database(); Database();
@ -268,8 +269,6 @@ public:
int CountInvSnapshots(); int CountInvSnapshots();
void ClearInvSnapshots(bool from_now = false); void ClearInvSnapshots(bool from_now = false);
/* EQEmuLogSys */
void LoadLogSettings(EQEmuLogSys::LogSettings* log_settings);
private: private:

80
common/eqemu_logsys.cpp
View File

@ -22,8 +22,8 @@
#include "rulesys.h" #include "rulesys.h"
#include "platform.h" #include "platform.h"
#include "string_util.h" #include "string_util.h"
#include "database.h"
#include "misc.h" #include "misc.h"
#include "repositories/logsys_categories_repository.h"
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
@ -31,6 +31,7 @@
#include <iomanip> #include <iomanip>
#include <time.h> #include <time.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <algorithm>
std::ofstream process_log; std::ofstream process_log;
@ -96,7 +97,7 @@ EQEmuLogSys::EQEmuLogSys()
*/ */
EQEmuLogSys::~EQEmuLogSys() = default; EQEmuLogSys::~EQEmuLogSys() = default;
void EQEmuLogSys::LoadLogSettingsDefaults() EQEmuLogSys *EQEmuLogSys::LoadLogSettingsDefaults()
{ {
/** /**
* Get Executable platform currently running this code (Zone/World/etc) * Get Executable platform currently running this code (Zone/World/etc)
@ -177,6 +178,8 @@ void EQEmuLogSys::LoadLogSettingsDefaults()
else if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformHC) { else if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformHC) {
platform_file_name = "hc"; platform_file_name = "hc";
} }
return this;
} }
/** /**
@ -601,3 +604,76 @@ void EQEmuLogSys::EnableConsoleLogging()
log_settings[log_index].is_category_enabled = 1; log_settings[log_index].is_category_enabled = 1;
} }
} }
EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings()
{
auto categories = LogsysCategoriesRepository::GetWhere(
*m_database,
"TRUE ORDER BY log_category_id"
);
// keep track of categories
std::vector<int> db_categories{};
db_categories.reserve(categories.size());
// loop through database categories
for (auto &c: categories) {
if (c.log_category_id <= Logs::None || c.log_category_id >= Logs::MaxCategoryID) {
continue;
}
log_settings[c.log_category_id].log_to_console = static_cast<uint8>(c.log_to_console);
log_settings[c.log_category_id].log_to_file = static_cast<uint8>(c.log_to_file);
log_settings[c.log_category_id].log_to_gmsay = static_cast<uint8>(c.log_to_gmsay);
// Determine if any output method is enabled for the category
// and set it to 1 so it can used to check if category is enabled
const bool log_to_console = log_settings[c.log_category_id].log_to_console > 0;
const bool log_to_file = log_settings[c.log_category_id].log_to_file > 0;
const bool log_to_gmsay = log_settings[c.log_category_id].log_to_gmsay > 0;
const bool is_category_enabled = log_to_console || log_to_file || log_to_gmsay;
if (is_category_enabled) {
log_settings[c.log_category_id].is_category_enabled = 1;
}
// This determines whether or not the process needs to actually file log anything.
// If we go through this whole loop and nothing is set to any debug level, there
// is no point to create a file or keep anything open
if (log_settings[c.log_category_id].log_to_file > 0) {
LogSys.file_logs_enabled = true;
}
db_categories.emplace_back(c.log_category_id);
}
// Auto inject categories that don't exist in the database...
for (int i = Logs::AA; i != Logs::MaxCategoryID; i++) {
if (std::find(db_categories.begin(), db_categories.end(), i) == db_categories.end()) {
LogInfo(
"Automatically adding new log category [{0}]",
Logs::LogCategoryName[i]
);
auto new_category = LogsysCategoriesRepository::NewEntity();
new_category.log_category_id = i;
new_category.log_category_description = EscapeString(Logs::LogCategoryName[i]);
new_category.log_to_console = log_settings[i].log_to_console;
new_category.log_to_gmsay = log_settings[i].log_to_gmsay;
new_category.log_to_file = log_settings[i].log_to_file;
LogsysCategoriesRepository::InsertOne(*m_database, new_category);
}
}
LogInfo("Loaded [{}] log categories", categories.size());
return this;
}
EQEmuLogSys *EQEmuLogSys::SetDatabase(Database *db)
{
m_database = db;
return this;
}

114
common/eqemu_logsys.h
View File

@ -23,8 +23,9 @@
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <stdio.h> #include <cstdio>
#include <functional> #include <functional>
#include <algorithm>
#ifdef _WIN32 #ifdef _WIN32
#ifdef utf16_to_utf8 #ifdef utf16_to_utf8
@ -37,9 +38,9 @@
namespace Logs { namespace Logs {
enum DebugLevel { enum DebugLevel {
General = 1, /* 1 - Low-Level general debugging, useful info on single line */ General = 1, // 1 - Low-Level general debugging, useful info on single line
Moderate, /* 2 - Informational based, used in functions, when particular things load */ Moderate, // 2 - Informational based, used in functions, when particular things load
Detail /* 3 - Use this for extreme detail in logging, usually in extreme debugging in the stack or interprocess communication */ Detail // 3 - Use this for extreme detail in logging, usually in extreme debugging in the stack or interprocess communication
}; };
/** /**
@ -127,7 +128,7 @@ namespace Logs {
/** /**
* If you add to this, make sure you update LogCategory * If you add to this, make sure you update LogCategory
*/ */
static const char* LogCategoryName[LogCategory::MaxCategoryID] = { static const char *LogCategoryName[LogCategory::MaxCategoryID] = {
"", "",
"AA", "AA",
"AI", "AI",
@ -206,6 +207,8 @@ namespace Logs {
#include "eqemu_logsys_log_aliases.h" #include "eqemu_logsys_log_aliases.h"
class Database;
class EQEmuLogSys { class EQEmuLogSys {
public: public:
EQEmuLogSys(); EQEmuLogSys();
@ -216,7 +219,8 @@ public:
* This should be handled on deconstructor but to be safe we use it anyways. * This should be handled on deconstructor but to be safe we use it anyways.
*/ */
void CloseFileLogs(); void CloseFileLogs();
void LoadLogSettingsDefaults(); EQEmuLogSys *LoadLogSettingsDefaults();
EQEmuLogSys *LoadLogDatabaseSettings();
/** /**
* @param directory_name * @param directory_name
@ -246,7 +250,7 @@ public:
* Used in file logs to prepend a timestamp entry for logs * Used in file logs to prepend a timestamp entry for logs
* @param time_stamp * @param time_stamp
*/ */
void SetCurrentTimeStamp(char* time_stamp); void SetCurrentTimeStamp(char *time_stamp);
/** /**
* @param log_name * @param log_name
@ -273,101 +277,53 @@ public:
/** /**
* Internally used memory reference for all log settings per category * Internally used memory reference for all log settings per category
* These are loaded via DB and have defaults loaded in LoadLogSettingsDefaults * These are loaded via DB and have defaults loaded in LoadLogSettingsDefaults
* Database loaded via Database::LoadLogSettings(log_settings) * Database loaded via LogSys.SetDatabase(&database)->LoadLogDatabaseSettings();
*/ */
LogSettings log_settings[Logs::LogCategory::MaxCategoryID]{}; LogSettings log_settings[Logs::LogCategory::MaxCategoryID]{};
bool file_logs_enabled = false; bool file_logs_enabled = false;
/** int log_platform = 0;
* Sets Executable platform (Zone/World/UCS) etc. std::string platform_file_name;
*/
int log_platform = 0;
/**
* File name used in writing logs
*/
std::string platform_file_name;
/** // gmsay
* GMSay Client Message colors mapped by category
*
* @param log_category
* @return
*/
uint16 GetGMSayColorFromCategory(uint16 log_category); uint16 GetGMSayColorFromCategory(uint16 log_category);
/** EQEmuLogSys * SetGMSayHandler(std::function<void(uint16 log_type, const std::string &)> f) {
* @param f on_log_gmsay_hook = f;
*/ return this;
void SetGMSayHandler(std::function<void(uint16 log_type, const std::string&)> f) { on_log_gmsay_hook = f; } }
/** // console
* @param f void SetConsoleHandler(
*/ std::function<void(
void SetConsoleHandler(std::function<void(uint16 debug_level, uint16 log_type, const std::string&)> f) { on_log_console_hook = f; } uint16 debug_level,
uint16 log_type,
/** const std::string &
* Silence console logging )> f
*/ ) { on_log_console_hook = f; }
void SilenceConsoleLogging(); void SilenceConsoleLogging();
/**
* Turn on all console logging
*/
void EnableConsoleLogging(); void EnableConsoleLogging();
// database
EQEmuLogSys *SetDatabase(Database *db);
private: private:
/** // reference to database
* Callback pointer to zone process for hooking logs to zone using GMSay Database *m_database;
*/
std::function<void(uint16 log_category, const std::string&)> on_log_gmsay_hook; std::function<void(uint16 log_category, const std::string &)> on_log_gmsay_hook;
std::function<void(uint16 debug_level, uint16 log_category, const std::string&)> on_log_console_hook; std::function<void(uint16 debug_level, uint16 log_category, const std::string &)> on_log_console_hook;
/**
* Formats log messages like '[Category] This is a log message'
*/
std::string FormatOutMessageString(uint16 log_category, const std::string &in_message); std::string FormatOutMessageString(uint16 log_category, const std::string &in_message);
/**
* Linux console color messages mapped by category
*
* @param log_category
* @return
*/
std::string GetLinuxConsoleColorFromCategory(uint16 log_category); std::string GetLinuxConsoleColorFromCategory(uint16 log_category);
/**
* Windows console color messages mapped by category
*/
uint16 GetWindowsConsoleColorFromCategory(uint16 log_category); uint16 GetWindowsConsoleColorFromCategory(uint16 log_category);
/**
* @param debug_level
* @param log_category
* @param message
*/
void ProcessConsoleMessage(uint16 debug_level, uint16 log_category, const std::string &message); void ProcessConsoleMessage(uint16 debug_level, uint16 log_category, const std::string &message);
/**
* @param debug_level
* @param log_category
* @param message
*/
void ProcessGMSay(uint16 debug_level, uint16 log_category, const std::string &message); void ProcessGMSay(uint16 debug_level, uint16 log_category, const std::string &message);
/**
* @param debug_level
* @param log_category
* @param message
*/
void ProcessLogWrite(uint16 debug_level, uint16 log_category, const std::string &message); void ProcessLogWrite(uint16 debug_level, uint16 log_category, const std::string &message);
/**
* @param log_category
* @return
*/
bool IsRfc5424LogCategory(uint16 log_category); bool IsRfc5424LogCategory(uint16 log_category);
}; };

2
common/repositories/base/base_logsys_categories_repository.h
View File

@ -4,7 +4,7 @@
* This repository was automatically generated and is NOT to be modified directly. * This repository was automatically generated and is NOT to be modified directly.
* Any repository modifications are meant to be made to the repository extending the base. * Any repository modifications are meant to be made to the repository extending the base.
* Any modifications to base repositories are to be made by the generator only * Any modifications to base repositories are to be made by the generator only
* *
* @generator ./utils/scripts/generators/repository-generator.pl * @generator ./utils/scripts/generators/repository-generator.pl
* @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
*/ */

91
loginserver/database.cpp
View File

@ -598,95 +598,6 @@ MySQLRequestResult Database::GetLoginserverApiTokens()
return QueryDatabase("SELECT token, can_write, can_read FROM login_api_tokens"); return QueryDatabase("SELECT token, can_write, can_read FROM login_api_tokens");
} }
/**
* @param log_settings
*/
void Database::LoadLogSettings(EQEmuLogSys::LogSettings *log_settings)
{
std::string query =
"SELECT "
"log_category_id, "
"log_category_description, "
"log_to_console, "
"log_to_file, "
"log_to_gmsay "
"FROM "
"logsys_categories "
"ORDER BY log_category_id";
auto results = QueryDatabase(query);
int log_category_id = 0;
int *categories_in_database = new int[1000];
for (auto row = results.begin(); row != results.end(); ++row) {
log_category_id = atoi(row[0]);
if (log_category_id <= Logs::None || log_category_id >= Logs::MaxCategoryID) {
continue;
}
log_settings[log_category_id].log_to_console = static_cast<uint8>(atoi(row[2]));
log_settings[log_category_id].log_to_file = static_cast<uint8>(atoi(row[3]));
log_settings[log_category_id].log_to_gmsay = static_cast<uint8>(atoi(row[4]));
/**
* Determine if any output method is enabled for the category
* and set it to 1 so it can used to check if category is enabled
*/
const bool log_to_console = log_settings[log_category_id].log_to_console > 0;
const bool log_to_file = log_settings[log_category_id].log_to_file > 0;
const bool log_to_gmsay = log_settings[log_category_id].log_to_gmsay > 0;
const bool is_category_enabled = log_to_console || log_to_file || log_to_gmsay;
if (is_category_enabled) {
log_settings[log_category_id].is_category_enabled = 1;
}
/**
* This determines whether or not the process needs to actually file log anything.
* If we go through this whole loop and nothing is set to any debug level, there is no point to create a file or keep anything open
*/
if (log_settings[log_category_id].log_to_file > 0) {
LogSys.file_logs_enabled = true;
}
categories_in_database[log_category_id] = 1;
}
/**
* Auto inject categories that don't exist in the database...
*/
for (int log_index = Logs::AA; log_index != Logs::MaxCategoryID; log_index++) {
if (categories_in_database[log_index] != 1) {
LogInfo(
"New Log Category [{0}] doesn't exist... Automatically adding to [logsys_categories] table...",
Logs::LogCategoryName[log_index]
);
auto inject_query = fmt::format(
"INSERT INTO logsys_categories "
"(log_category_id, "
"log_category_description, "
"log_to_console, "
"log_to_file, "
"log_to_gmsay) "
"VALUES "
"({0}, '{1}', {2}, {3}, {4})",
log_index,
EscapeString(Logs::LogCategoryName[log_index]),
std::to_string(log_settings[log_index].log_to_console),
std::to_string(log_settings[log_index].log_to_file),
std::to_string(log_settings[log_index].log_to_gmsay)
);
QueryDatabase(inject_query);
}
}
delete[] categories_in_database;
}
/** /**
* @param account_name * @param account_name
* @param account_password * @param account_password
@ -806,4 +717,4 @@ Database::DbLoginServerAccount Database::GetLoginServerAccountByAccountName(
} }
return login_server_account; return login_server_account;
} }

5
loginserver/database.h
View File

@ -201,11 +201,6 @@ public:
unsigned int &server_admin_id unsigned int &server_admin_id
); );
/**
* @param log_settings
*/
void LoadLogSettings(EQEmuLogSys::LogSettings *log_settings);
/** /**
* @param write_mode * @param write_mode
* @param read_mode * @param read_mode

3
loginserver/main.cpp
View File

@ -165,8 +165,7 @@ int main(int argc, char **argv)
LoadDatabaseConnection(); LoadDatabaseConnection();
if (argc == 1) { if (argc == 1) {
server.db->LoadLogSettings(LogSys.log_settings); LogSys.LoadLogDatabaseSettings()->StartFileLogs();
LogSys.StartFileLogs();
} }
/** /**

86
queryserv/database.cpp
View File

@ -448,89 +448,3 @@ void Database::GeneralQueryReceive(ServerPacket *pack)
safe_delete_array(queryBuffer); safe_delete_array(queryBuffer);
} }
void Database::LoadLogSettings(EQEmuLogSys::LogSettings *log_settings)
{
std::string query =
"SELECT "
"log_category_id, "
"log_category_description, "
"log_to_console, "
"log_to_file, "
"log_to_gmsay "
"FROM "
"logsys_categories "
"ORDER BY log_category_id";
auto results = QueryDatabase(query);
int log_category_id = 0;
int *categories_in_database = new int[1000];
for (auto row = results.begin(); row != results.end(); ++row) {
log_category_id = atoi(row[0]);
if (log_category_id <= Logs::None || log_category_id >= Logs::MaxCategoryID) {
continue;
}
log_settings[log_category_id].log_to_console = static_cast<uint8>(atoi(row[2]));
log_settings[log_category_id].log_to_file = static_cast<uint8>(atoi(row[3]));
log_settings[log_category_id].log_to_gmsay = static_cast<uint8>(atoi(row[4]));
/**
* Determine if any output method is enabled for the category
* and set it to 1 so it can used to check if category is enabled
*/
const bool log_to_console = log_settings[log_category_id].log_to_console > 0;
const bool log_to_file = log_settings[log_category_id].log_to_file > 0;
const bool log_to_gmsay = log_settings[log_category_id].log_to_gmsay > 0;
const bool is_category_enabled = log_to_console || log_to_file || log_to_gmsay;
if (is_category_enabled) {
log_settings[log_category_id].is_category_enabled = 1;
}
/**
* This determines whether or not the process needs to actually file log anything.
* If we go through this whole loop and nothing is set to any debug level, there is no point to create a file or keep anything open
*/
if (log_settings[log_category_id].log_to_file > 0) {
LogSys.file_logs_enabled = true;
}
categories_in_database[log_category_id] = 1;
}
/**
* Auto inject categories that don't exist in the database...
*/
for (int log_index = Logs::AA; log_index != Logs::MaxCategoryID; log_index++) {
if (categories_in_database[log_index] != 1) {
LogInfo(
"New Log Category [{0}] doesn't exist... Automatically adding to [logsys_categories] table...",
Logs::LogCategoryName[log_index]
);
auto inject_query = fmt::format(
"INSERT INTO logsys_categories "
"(log_category_id, "
"log_category_description, "
"log_to_console, "
"log_to_file, "
"log_to_gmsay) "
"VALUES "
"({0}, '{1}', {2}, {3}, {4})",
log_index,
EscapeString(Logs::LogCategoryName[log_index]),
std::to_string(log_settings[log_index].log_to_console),
std::to_string(log_settings[log_index].log_to_file),
std::to_string(log_settings[log_index].log_to_gmsay)
);
QueryDatabase(inject_query);
}
}
delete[] categories_in_database;
}

2
queryserv/database.h
View File

@ -53,8 +53,6 @@ public:
void LogMerchantTransaction(QSMerchantLogTransaction_Struct* QS, uint32 Items); void LogMerchantTransaction(QSMerchantLogTransaction_Struct* QS, uint32 Items);
void GeneralQueryReceive(ServerPacket *pack); void GeneralQueryReceive(ServerPacket *pack);
void LoadLogSettings(EQEmuLogSys::LogSettings* log_settings);
protected: protected:
void HandleMysqlError(uint32 errnum); void HandleMysqlError(uint32 errnum);
private: private:

26
queryserv/queryserv.cpp
View File

@ -42,15 +42,15 @@ const queryservconfig *Config;
WorldServer *worldserver = 0; WorldServer *worldserver = 0;
EQEmuLogSys LogSys; EQEmuLogSys LogSys;
void CatchSignal(int sig_num) { void CatchSignal(int sig_num) {
RunLoops = false; RunLoops = false;
} }
int main() { int main() {
RegisterExecutablePlatform(ExePlatformQueryServ); RegisterExecutablePlatform(ExePlatformQueryServ);
LogSys.LoadLogSettingsDefaults(); LogSys.LoadLogSettingsDefaults();
set_exception_handler(); set_exception_handler();
Timer LFGuildExpireTimer(60000); Timer LFGuildExpireTimer(60000);
LogInfo("Starting EQEmu QueryServ"); LogInfo("Starting EQEmu QueryServ");
if (!queryservconfig::LoadConfig()) { if (!queryservconfig::LoadConfig()) {
@ -58,11 +58,11 @@ int main() {
return 1; return 1;
} }
Config = queryservconfig::get(); Config = queryservconfig::get();
WorldShortName = Config->ShortName; WorldShortName = Config->ShortName;
LogInfo("Connecting to MySQL"); LogInfo("Connecting to MySQL");
/* MySQL Connection */ /* MySQL Connection */
if (!database.Connect( if (!database.Connect(
Config->QSDatabaseHost.c_str(), Config->QSDatabaseHost.c_str(),
@ -74,9 +74,9 @@ int main() {
return 1; return 1;
} }
/* Register Log System and Settings */ LogSys.SetDatabase(&database)
database.LoadLogSettings(LogSys.log_settings); ->LoadLogDatabaseSettings()
LogSys.StartFileLogs(); ->StartFileLogs();
if (signal(SIGINT, CatchSignal) == SIG_ERR) { if (signal(SIGINT, CatchSignal) == SIG_ERR) {
LogInfo("Could not set signal handler"); LogInfo("Could not set signal handler");
@ -89,13 +89,13 @@ int main() {
/* Initial Connection to Worldserver */ /* Initial Connection to Worldserver */
worldserver = new WorldServer; worldserver = new WorldServer;
worldserver->Connect(); worldserver->Connect();
/* Load Looking For Guild Manager */ /* Load Looking For Guild Manager */
lfguildmanager.LoadDatabase(); lfguildmanager.LoadDatabase();
while(RunLoops) { while(RunLoops) {
Timer::SetCurrentTime(); Timer::SetCurrentTime();
if(LFGuildExpireTimer.Check()) if(LFGuildExpireTimer.Check())
lfguildmanager.ExpireEntries(); lfguildmanager.ExpireEntries();

6
shared_memory/main.cpp
View File

@ -120,9 +120,9 @@ int main(int argc, char **argv)
content_db.SetMysql(database.getMySQL()); content_db.SetMysql(database.getMySQL());
} }
/* Register Log System and Settings */ LogSys.SetDatabase(&database)
database.LoadLogSettings(LogSys.log_settings); ->LoadLogDatabaseSettings()
LogSys.StartFileLogs(); ->StartFileLogs();
std::string shared_mem_directory = Config->SharedMemDir; std::string shared_mem_directory = Config->SharedMemDir;
if (MakeDirectory(shared_mem_directory)) { if (MakeDirectory(shared_mem_directory)) {

86
ucs/database.cpp
View File

@ -673,89 +673,3 @@ void Database::GetFriendsAndIgnore(int charID, std::vector<std::string> &friends
} }
} }
void Database::LoadLogSettings(EQEmuLogSys::LogSettings *log_settings)
{
std::string query =
"SELECT "
"log_category_id, "
"log_category_description, "
"log_to_console, "
"log_to_file, "
"log_to_gmsay "
"FROM "
"logsys_categories "
"ORDER BY log_category_id";
auto results = QueryDatabase(query);
int log_category_id = 0;
int *categories_in_database = new int[1000];
for (auto row = results.begin(); row != results.end(); ++row) {
log_category_id = atoi(row[0]);
if (log_category_id <= Logs::None || log_category_id >= Logs::MaxCategoryID) {
continue;
}
log_settings[log_category_id].log_to_console = static_cast<uint8>(atoi(row[2]));
log_settings[log_category_id].log_to_file = static_cast<uint8>(atoi(row[3]));
log_settings[log_category_id].log_to_gmsay = static_cast<uint8>(atoi(row[4]));
/**
* Determine if any output method is enabled for the category
* and set it to 1 so it can used to check if category is enabled
*/
const bool log_to_console = log_settings[log_category_id].log_to_console > 0;
const bool log_to_file = log_settings[log_category_id].log_to_file > 0;
const bool log_to_gmsay = log_settings[log_category_id].log_to_gmsay > 0;
const bool is_category_enabled = log_to_console || log_to_file || log_to_gmsay;
if (is_category_enabled) {
log_settings[log_category_id].is_category_enabled = 1;
}
/**
* This determines whether or not the process needs to actually file log anything.
* If we go through this whole loop and nothing is set to any debug level, there is no point to create a file or keep anything open
*/
if (log_settings[log_category_id].log_to_file > 0) {
LogSys.file_logs_enabled = true;
}
categories_in_database[log_category_id] = 1;
}
/**
* Auto inject categories that don't exist in the database...
*/
for (int log_index = Logs::AA; log_index != Logs::MaxCategoryID; log_index++) {
if (categories_in_database[log_index] != 1) {
LogInfo(
"New Log Category [{0}] doesn't exist... Automatically adding to [logsys_categories] table...",
Logs::LogCategoryName[log_index]
);
auto inject_query = fmt::format(
"INSERT INTO logsys_categories "
"(log_category_id, "
"log_category_description, "
"log_to_console, "
"log_to_file, "
"log_to_gmsay) "
"VALUES "
"({0}, '{1}', {2}, {3}, {4})",
log_index,
EscapeString(Logs::LogCategoryName[log_index]),
std::to_string(log_settings[log_index].log_to_console),
std::to_string(log_settings[log_index].log_to_file),
std::to_string(log_settings[log_index].log_to_gmsay)
);
QueryDatabase(inject_query);
}
}
delete[] categories_in_database;
}

3
ucs/database.h
View File

@ -57,8 +57,7 @@ public:
void ExpireMail(); void ExpireMail();
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 LoadLogSettings(EQEmuLogSys::LogSettings* log_settings);
protected: protected:

6
ucs/ucs.cpp
View File

@ -97,9 +97,9 @@ int main() {
return 1; return 1;
} }
/* Register Log System and Settings */ LogSys.SetDatabase(&database)
database.LoadLogSettings(LogSys.log_settings); ->LoadLogDatabaseSettings()
LogSys.StartFileLogs(); ->StartFileLogs();
char tmp[64]; char tmp[64];

8
world/main.cpp
View File

@ -297,11 +297,9 @@ int main(int argc, char** argv) {
guild_mgr.SetDatabase(&database); guild_mgr.SetDatabase(&database);
/** LogSys.SetDatabase(&database)
* Logging ->LoadLogDatabaseSettings()
*/ ->StartFileLogs();
database.LoadLogSettings(LogSys.log_settings);
LogSys.StartFileLogs();
/** /**
* Parse simple CLI passes * Parse simple CLI passes

6
world/zoneserver.cpp
View File

@ -812,7 +812,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
} }
case ServerOP_ReloadLogs: { case ServerOP_ReloadLogs: {
zoneserver_list.SendPacket(pack); zoneserver_list.SendPacket(pack);
database.LoadLogSettings(LogSys.log_settings); LogSys.LoadLogDatabaseSettings();
break; break;
} }
case ServerOP_ReloadRules: { case ServerOP_ReloadRules: {
@ -1289,11 +1289,11 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
case ServerOP_CZTaskDisablePlayer: case ServerOP_CZTaskDisablePlayer:
case ServerOP_CZTaskDisableGroup: case ServerOP_CZTaskDisableGroup:
case ServerOP_CZTaskDisableRaid: case ServerOP_CZTaskDisableRaid:
case ServerOP_CZTaskDisableGuild: case ServerOP_CZTaskDisableGuild:
case ServerOP_CZTaskEnablePlayer: case ServerOP_CZTaskEnablePlayer:
case ServerOP_CZTaskEnableGroup: case ServerOP_CZTaskEnableGroup:
case ServerOP_CZTaskEnableRaid: case ServerOP_CZTaskEnableRaid:
case ServerOP_CZTaskEnableGuild: case ServerOP_CZTaskEnableGuild:
case ServerOP_CZTaskFailPlayer: case ServerOP_CZTaskFailPlayer:
case ServerOP_CZTaskFailGroup: case ServerOP_CZTaskFailGroup:
case ServerOP_CZTaskFailRaid: case ServerOP_CZTaskFailRaid:

7
zone/main.cpp
View File

@ -254,9 +254,10 @@ int main(int argc, char** argv) {
} }
/* Register Log System and Settings */ /* Register Log System and Settings */
LogSys.SetGMSayHandler(&Zone::GMSayHookCallBackProcess); LogSys.SetDatabase(&database)
database.LoadLogSettings(LogSys.log_settings); ->LoadLogDatabaseSettings()
LogSys.StartFileLogs(); ->SetGMSayHandler(&Zone::GMSayHookCallBackProcess)
->StartFileLogs();
/* Guilds */ /* Guilds */
guild_mgr.SetDatabase(&database); guild_mgr.SetDatabase(&database);

2
zone/worldserver.cpp
View File

@ -1833,7 +1833,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
break; break;
} }
case ServerOP_ReloadLogs: { case ServerOP_ReloadLogs: {
database.LoadLogSettings(LogSys.log_settings); LogSys.LoadLogDatabaseSettings();
break; break;
} }
case ServerOP_ReloadPerlExportSettings: { case ServerOP_ReloadPerlExportSettings: {