pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-21 17:02:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup world logging [skip ci]

Browse Source
This commit is contained in:
Akkadius 2019-09-06 12:03:50 -05:00
parent e4bfc547cb
commit 45278f80ca
1 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
world/net.cpp
View File

@ -118,18 +118,20 @@ int main(int argc, char** argv) {
LogSys.LoadLogSettingsDefaults(); LogSys.LoadLogSettingsDefaults();
set_exception_handler(); set_exception_handler();
/* If eqemu_config.json does not exist - create it from conversion... */ /**
if (!std::ifstream("eqemu_config.json")) { * Auto convert json config from xml
*/
if (!std::ifstream("eqemu_config.json") && std::ifstream("eqemu_config.xml")) {
CheckForServerScript(true); CheckForServerScript(true);
/* Run EQEmu Server script (Checks for database updates) */
if(system("perl eqemu_server.pl convert_xml")); if(system("perl eqemu_server.pl convert_xml"));
} }
else { else {
/* Download EQEmu Server Maintenance Script if doesn't exist */
CheckForServerScript(); CheckForServerScript();
} }
/* Database Version Check */ /**
* Database version
*/
uint32 Database_Version = CURRENT_BINARY_DATABASE_VERSION; uint32 Database_Version = CURRENT_BINARY_DATABASE_VERSION;
uint32 Bots_Database_Version = CURRENT_BINARY_BOTS_DATABASE_VERSION; uint32 Bots_Database_Version = CURRENT_BINARY_BOTS_DATABASE_VERSION;
if (argc >= 2) { if (argc >= 2) {
@ -142,7 +144,7 @@ int main(int argc, char** argv) {
// Load server configuration // Load server configuration
LogInfo("Loading server configuration"); LogInfo("Loading server configuration");
if (!WorldConfig::LoadConfig()) { if (!WorldConfig::LoadConfig()) {
LogInfo("Loading server configuration failed"); LogError("Loading server configuration failed");
return 1; return 1;
} }
@ -151,36 +153,50 @@ int main(int argc, char** argv) {
LogInfo("CURRENT_VERSION: [{}]", CURRENT_VERSION); LogInfo("CURRENT_VERSION: [{}]", CURRENT_VERSION);
if (signal(SIGINT, CatchSignal) == SIG_ERR) { if (signal(SIGINT, CatchSignal) == SIG_ERR) {
LogInfo("Could not set signal handler"); LogError("Could not set signal handler");
return 1; return 1;
} }
if (signal(SIGTERM, CatchSignal) == SIG_ERR) { if (signal(SIGTERM, CatchSignal) == SIG_ERR) {
LogInfo("Could not set signal handler"); LogError("Could not set signal handler");
return 1; return 1;
} }
#ifndef WIN32 #ifndef WIN32
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) { if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
LogInfo("Could not set signal handler"); LogError("Could not set signal handler");
return 1; return 1;
} }
#endif #endif
// add login server config to list /**
* Add Loginserver
*/
if (Config->LoginCount == 0) { if (Config->LoginCount == 0) {
if (Config->LoginHost.length()) { if (Config->LoginHost.length()) {
loginserverlist.Add(Config->LoginHost.c_str(), Config->LoginPort, Config->LoginAccount.c_str(), Config->LoginPassword.c_str(), Config->LoginLegacy); loginserverlist.Add(
Config->LoginHost.c_str(),
Config->LoginPort,
Config->LoginAccount.c_str(),
Config->LoginPassword.c_str(),
Config->LoginLegacy
);
LogInfo("Added loginserver [{}]:[{}]", Config->LoginHost.c_str(), Config->LoginPort); LogInfo("Added loginserver [{}]:[{}]", Config->LoginHost.c_str(), Config->LoginPort);
} }
} }
else { else {
LinkedList<LoginConfig*> loginlist = Config->loginlist; LinkedList<LoginConfig *> loginlist = Config->loginlist;
LinkedListIterator<LoginConfig*> iterator(loginlist); LinkedListIterator<LoginConfig *> iterator(loginlist);
iterator.Reset(); iterator.Reset();
while (iterator.MoreElements()) { while (iterator.MoreElements()) {
loginserverlist.Add(iterator.GetData()->LoginHost.c_str(), iterator.GetData()->LoginPort, iterator.GetData()->LoginAccount.c_str(), iterator.GetData()->LoginPassword.c_str(), loginserverlist.Add(
iterator.GetData()->LoginLegacy); iterator.GetData()->LoginHost.c_str(),
iterator.GetData()->LoginPort,
iterator.GetData()->LoginAccount.c_str(),
iterator.GetData()->LoginPassword.c_str(),
iterator.GetData()->LoginLegacy
);
LogInfo("Added loginserver [{}]:[{}]", iterator.GetData()->LoginHost.c_str(), iterator.GetData()->LoginPort); LogInfo("Added loginserver [{}]:[{}]", iterator.GetData()->LoginHost.c_str(), iterator.GetData()->LoginPort);
iterator.Advance(); iterator.Advance();
} }
@ -193,7 +209,7 @@ int main(int argc, char** argv) {
Config->DatabasePassword.c_str(), Config->DatabasePassword.c_str(),
Config->DatabaseDB.c_str(), Config->DatabaseDB.c_str(),
Config->DatabasePort)) { Config->DatabasePort)) {
LogInfo("Cannot continue without a database connection"); LogError("Cannot continue without a database connection");
return 1; return 1;
} }
guild_mgr.SetDatabase(&database); guild_mgr.SetDatabase(&database);
@ -330,10 +346,12 @@ int main(int argc, char** argv) {
database.ClearInvSnapshots(); database.ClearInvSnapshots();
LogInfo("Loading items"); LogInfo("Loading items");
if (!database.LoadItems(hotfix_name)) if (!database.LoadItems(hotfix_name))
LogInfo("Error: Could not load item data. But ignoring"); LogError("Error: Could not load item data. But ignoring");
LogInfo("Loading skill caps"); LogInfo("Loading skill caps");
if (!database.LoadSkillCaps(std::string(hotfix_name))) if (!database.LoadSkillCaps(std::string(hotfix_name)))
LogInfo("Error: Could not load skill cap data. But ignoring"); LogError("Error: Could not load skill cap data. But ignoring");
LogInfo("Loading guilds"); LogInfo("Loading guilds");
guild_mgr.LoadGuilds(); guild_mgr.LoadGuilds();
//rules: //rules:
@ -350,7 +368,7 @@ int main(int argc, char** argv) {
LogInfo("No rule set configured, using default rules"); LogInfo("No rule set configured, using default rules");
} }
else { else {
LogInfo("Loaded default rule set 'default'", tmp.c_str()); LogInfo("Loaded default rule set [default]", tmp.c_str());
} }
} }
@ -539,7 +557,7 @@ int main(int argc, char** argv) {
//check the stream identifier for any now-identified streams //check the stream identifier for any now-identified streams
while ((eqsi = stream_identifier.PopIdentified())) { while ((eqsi = stream_identifier.PopIdentified())) {
//now that we know what patch they are running, start up their client object //now that we know what patch they are running, start up their client object
struct in_addr in; struct in_addr in{};
in.s_addr = eqsi->GetRemoteIP(); in.s_addr = eqsi->GetRemoteIP();
if (RuleB(World, UseBannedIPsTable)) { //Lieka: Check to see if we have the responsibility for blocking IPs. if (RuleB(World, UseBannedIPsTable)) { //Lieka: Check to see if we have the responsibility for blocking IPs.
LogInfo("Checking inbound connection [{}] against BannedIPs table", inet_ntoa(in)); LogInfo("Checking inbound connection [{}] against BannedIPs table", inet_ntoa(in));
@ -573,9 +591,9 @@ int main(int argc, char** argv) {
TimeOfDay_Struct tod; TimeOfDay_Struct tod;
zoneserver_list.worldclock.GetCurrentEQTimeOfDay(time(0), &tod); zoneserver_list.worldclock.GetCurrentEQTimeOfDay(time(0), &tod);
if (!database.SaveTime(tod.minute, tod.hour, tod.day, tod.month, tod.year)) if (!database.SaveTime(tod.minute, tod.hour, tod.day, tod.month, tod.year))
LogInfo("Failed to save eqtime"); LogError("Failed to save eqtime");
else else
LogInfo("EQTime successfully saved"); LogDebug("EQTime successfully saved");
} }
zoneserver_list.Process(); zoneserver_list.Process();