diff options
| author | Spp <spp@jorge.gr> | 2013-01-16 15:29:41 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2013-01-16 15:29:41 +0100 |
| commit | 0e8011657d08c4a9f12657ccbe2f73aa56effaaa (patch) | |
| tree | 23a6f5d51b4febcd7be8acd0b49eed173640bcf2 /src/server/worldserver | |
| parent | 9391d087fd1707ae9298e0f6ced54bf3d7f11c13 (diff) | |
| parent | 927062f61fb0c61da0e31f38e9be249f81c89d6c (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
Diffstat (limited to 'src/server/worldserver')
| -rw-r--r-- | src/server/worldserver/Master.cpp | 2 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 8 |
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 4ae9ab6c503..af8f61ce7f3 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -2792,6 +2792,14 @@ 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 + +# ################################################################################################### ################################################################################################### |