Core/Log: Implement log masks for debug log level, to allow selective debug output. Update your worldserver.conf.

2 files changed, 45 insertions, 21 deletions

diff --git a/src/server/worldserver/TCSoap/TCSoap.cpp b/src/server/worldserver/TCSoap/TCSoap.cpp
index 66a58caba80..c023e5c62a0 100755
--- a/src/server/worldserver/TCSoap/TCSoap.cpp
+++ b/src/server/worldserver/TCSoap/TCSoap.cpp
@@ -49,7 +49,7 @@ void TCSoapRunnable::run()
         if (!soap_valid_socket(soap_accept(&soap)))
             continue;   // ran into an accept timeout
 
-        sLog->outDebug("TCSoap: accepted connection from IP=%d.%d.%d.%d", (int)(soap.ip>>24)&0xFF, (int)(soap.ip>>16)&0xFF, (int)(soap.ip>>8)&0xFF, (int)soap.ip&0xFF);
+        sLog->outDebug(LOG_FILTER_NETWORKIO, "TCSoap: accepted connection from IP=%d.%d.%d.%d", (int)(soap.ip>>24)&0xFF, (int)(soap.ip>>16)&0xFF, (int)(soap.ip>>8)&0xFF, (int)soap.ip&0xFF);
         struct soap* thread_soap = soap_copy(&soap);// make a safe copy
 
         ACE_Message_Block *mb = new ACE_Message_Block(sizeof(struct soap*));
@@ -87,33 +87,33 @@ int ns1__executeCommand(soap* soap, char* command, char** result)
     // security check
     if (!soap->userid || !soap->passwd)
     {
-        sLog->outDebug("TCSoap: Client didn't provide login information");
+        sLog->outDebug(LOG_FILTER_NETWORKIO, "TCSoap: Client didn't provide login information");
         return 401;
     }
 
     uint32 accountId = sAccountMgr->GetId(soap->userid);
     if(!accountId)
     {
-        sLog->outDebug("TCSoap: Client used invalid username '%s'", soap->userid);
+        sLog->outDebug(LOG_FILTER_NETWORKIO, "TCSoap: Client used invalid username '%s'", soap->userid);
         return 401;
     }
 
     if(!sAccountMgr->CheckPassword(accountId, soap->passwd))
     {
-        sLog->outDebug("TCSoap: invalid password for account '%s'", soap->userid);
+        sLog->outDebug(LOG_FILTER_NETWORKIO, "TCSoap: invalid password for account '%s'", soap->userid);
         return 401;
     }
 
     if(sAccountMgr->GetSecurity(accountId) < SEC_ADMINISTRATOR)
     {
-        sLog->outDebug("TCSoap: %s's gmlevel is too low", soap->userid);
+        sLog->outDebug(LOG_FILTER_NETWORKIO, "TCSoap: %s's gmlevel is too low", soap->userid);
         return 403;
     }
 
     if(!command || !*command)
         return soap_sender_fault(soap, "Command mustn't be empty", "The supplied command was an empty string");
 
-    sLog->outDebug("TCSoap: got command '%s'", command);
+    sLog->outDebug(LOG_FILTER_NETWORKIO, "TCSoap: got command '%s'", command);
     SOAPCommand connection;
 
     // commands are executed in the world thread. We have to wait for them to be completed
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index d0ccc619985..3109c922914 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -440,21 +440,45 @@ LogTimestamp = 0
 LogFileLevel = 0
 
 #
-#    LogFilter_AchievementUpdates
-#    LogFilter_CreatureMoves
-#    LogFilter_TransportMoves
-#    LogFilter_VisibilityChanges
-#        Description: Filter log events
-#        Default:     1 - (Enabled, LogFilter_AchievementUpdates)
-#                     1 - (Enabled, LogFilter_CreatureMoves)
-#                     1 - (Enabled, LogFilter_TransportMoves)
-#                     1 - (Enabled, LogFilter_VisibilityChanges)
-#                     0 - (Disabled)
-
-LogFilter_AchievementUpdates = 1
-LogFilter_CreatureMoves      = 1
-LogFilter_TransportMoves     = 1
-LogFilter_VisibilityChanges  = 1
+#    Debug Log Mask
+#        Description: Bitmask that determines which debug log output (level 3)
+#                     will be logged.
+#        Possible flags:
+#                   1 - Anything related to units that doesn't fit in other
+#                          categories.
+#                   2 - Anything related to pets.
+#                   4 - Anything related to vehicles. 
+#                   8 - Anything related to C++ AI, instance scripts, etc.
+#                  16 - Anything related to DB AI, such as SAI, EAI, CreatureAI
+#                  32 - Anything related to DB map scripts
+#                  64 - Anything related to network input/output,
+#                        such as packet handlers and netcode logs
+#                 128 - Anything related to the spellsystem and aurasystem
+#                 256 - Anything related to the achievement system
+#                 512 - Anything related to the condition system
+#                1024 - Anything related to the pool system
+#                2048 - Anything related to the auction house
+#                4096 - Anything related to arena's and battlegrounds
+#                8192 - Anything related to outdoor PVP
+#               16384 - Anything related to the chat system
+#               32768 - Anything related to the LFG system
+#               65536 - Anything related to maps, instances (not scripts),
+#                       grids, cells, visibility, etc.
+#              131072 - Anything related to player loading from DB
+#                      (Player::_LoadXXX functions)
+#              262144 - Anything related to items
+#              524288 - Anything related to player skills 
+#                      (do not confuse with spells)
+#             1048576 - Anything related to loot
+#             2097152 - Anything related to guilds
+#             4194304 - Anything related to transports
+#
+#                       Simply add the values together to create a bitmask.
+#                       For more info see enum DebugLogFilters in Log.h
+#
+#             Default: 0 (nothing)
+
+DebugLogMask = 0
 
 #
 #    WorldLogFile