Small fix to prevent unintended DB logging

--HG--
branch : trunk

2 files changed, 10 insertions, 1 deletions

diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp
index a478f18daa9..6a952b936d3 100644
--- a/src/trinitycore/Master.cpp
+++ b/src/trinitycore/Master.cpp
@@ -403,6 +403,7 @@ int Master::Run()
 /// Initialize connection to the databases
 bool Master::_StartDB()
 {
+    sLog.SetLogDB(false);
     std::string dbstring;
 
     ///- Get world database info from configuration file
@@ -459,7 +460,7 @@ bool Master::_StartDB()
     }
     sLog.outString("Realm running as realm ID %d", realmID);
 
-	///- Initialize the DB logging system
+    ///- Initialize the DB logging system
     if(sConfig.GetBoolDefault("EnableLogDB", false))
     {
         // everything successful - set var to enable DB logging once startup finished.
@@ -471,6 +472,7 @@ bool Master::_StartDB()
     {
         sLog.SetLogDBLater(false);
         sLog.SetLogDB(false);
+        sLog.SetRealmID(realmID);
     }
 
     ///- Clean the database before starting
diff --git a/src/trinityrealm/Main.cpp b/src/trinityrealm/Main.cpp
index 65596e35b21..cbadd4d1e4c 100644
--- a/src/trinityrealm/Main.cpp
+++ b/src/trinityrealm/Main.cpp
@@ -83,6 +83,7 @@ void usage(const char *prog)
 /// Launch the realm server
 extern int main(int argc, char **argv)
 {
+    sLog.SetLogDB(false);
     ///- Command line parsing to get the configuration file name
     char const* cfg_file = _TRINITY_REALM_CONFIG;
     int c=1;
@@ -191,6 +192,12 @@ extern int main(int argc, char **argv)
         // ensure we've set realm to 0 (realmd realmid)
         sLog.SetRealmID(0);
     }
+    else
+    {
+        sLog.SetLogDBLater(false);
+        sLog.SetLogDB(false);
+        sLog.SetRealmID(0);
+    }
 
     ///- Get the list of realms for the server
     m_realmList.Initialize(sConfig.GetIntDefault("RealmsStateUpdateDelay", 20));