aboutsummaryrefslogtreecommitdiff
path: root/src/server/worldserver
diff options
context:
space:
mode:
authorVincent_Michael <Vincent_Michael@gmx.de>2013-01-16 23:43:07 +0100
committerVincent_Michael <Vincent_Michael@gmx.de>2013-01-16 23:43:07 +0100
commit224b4480a70c4896d67e2f2907620b550e585057 (patch)
tree6241ec784a2594c10d51ebb5a010667a1d0bf00e /src/server/worldserver
parent11bd11badcb730304efa9f850c925dd426f756fd (diff)
parenta8652baaa437cca3eced2d533c0dde3ca3184d1b (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Diffstat (limited to 'src/server/worldserver')
-rw-r--r--src/server/worldserver/Master.cpp2
-rw-r--r--src/server/worldserver/worldserver.conf.dist8
2 files changed, 8 insertions, 2 deletions
diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp
index fe872c1977f..56dd64bc45a 100644
--- a/src/server/worldserver/Master.cpp
+++ b/src/server/worldserver/Master.cpp
@@ -438,8 +438,6 @@ bool Master::_StartDB()
}
sLog->outInfo(LOG_FILTER_WORLDSERVER, "Realm running as realm ID %d", realmID);
- sLog->SetRealmID(realmID);
-
///- Clean the database before starting
ClearOnlineAccounts();
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index 7c7aacd2f47..b3e6b636b32 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -2824,4 +2824,12 @@ Logger.Opcodes=41,6,Console Server
Loggers=Root Chat DBErrors GM RA Warden Character Load WorldServer Opcodes
#
+# Log.Async.Enable
+# Description: Enables asyncronous message logging.
+# Default: 0 - (Disabled)
+# 1 - (Enabled)
+
+Log.Async.Enable = 0
+
+#
###################################################################################################