pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 22:58:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add a copy of load log settings to UCS because of how split Database classes are laid out

Browse Source
This commit is contained in:
Akkadius
2015-01-20 05:18:44 -06:00
parent e4797d04f0
commit 931134688a
3 changed files with 48 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ucs/ucs.cpp
+15 -18
View File
@@ -33,25 +33,21 @@
#include <list>
#include <signal.h>
volatile bool RunLoops = true;
uint32 MailMessagesSent = 0;
uint32 ChatMessagesSent = 0;
TimeoutManager timeout_manager;
Clientlist *CL;
ChatChannelList *ChannelList;
Clientlist *CL;
EQEmuLogSys Log;
TimeoutManager timeout_manager;
Database database;
std::string WorldShortName;
WorldServer *worldserver = nullptr;
const ucsconfig *Config;
WorldServer *worldserver = nullptr;
EQEmuLogSys Log;
std::string WorldShortName;
uint32 ChatMessagesSent = 0;
uint32 MailMessagesSent = 0;
volatile bool RunLoops = true;
void CatchSignal(int sig_num) {
@@ -80,10 +76,8 @@ int main() {
Log.Out(Logs::General, Logs::UCS_Server, "Starting EQEmu Universal Chat Server.");
if (!ucsconfig::LoadConfig()) {
Log.Out(Logs::General, Logs::UCS_Server, "Loading server configuration failed.");
if (!ucsconfig::LoadConfig()) {
Log.Out(Logs::General, Logs::UCS_Server, "Loading server configuration failed.");
return 1;
}
@@ -103,6 +97,9 @@ int main() {
return 1;
}
/* Register Log System and Settings */
database.LoadLogSysSettings(Log.log_settings);
char tmp[64];
if (database.GetVariable("RuleSet", tmp, sizeof(tmp)-1)) {