aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/server/game/Server/WorldSocket.cpp4
-rw-r--r--src/server/shared/Logging/Appender.cpp18
-rw-r--r--src/server/shared/Logging/Appender.h4
-rw-r--r--src/server/shared/Logging/Log.cpp8
-rw-r--r--src/server/worldserver/worldserver.conf.dist97
5 files changed, 50 insertions, 81 deletions
diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp
index f73e36f3fbd..a30702ded14 100644
--- a/src/server/game/Server/WorldSocket.cpp
+++ b/src/server/game/Server/WorldSocket.cpp
@@ -194,7 +194,7 @@ int WorldSocket::SendPacket(WorldPacket const& pct)
pkt = &buff;
}
- sLog->outOpCode(uint32(pkt->GetOpcode()), LookupOpcodeName(pkt->GetOpcode()), true);
+ sLog->outInfo(LOG_FILTER_OPCODES, "S->C: %s 0x%.4X (%u)", LookupOpcodeName(pkt->GetOpcode()), uint32(pkt->GetOpcode()), uint32(pkt->GetOpcode()));
sScriptMgr->OnPacketSend(this, *pkt);
@@ -719,7 +719,7 @@ int WorldSocket::ProcessIncoming(WorldPacket* new_pct)
sLog->outTrace(LOG_FILTER_NETWORKIO, "%s", data.c_str());
}
- sLog->outOpCode(uint32(Opcodes(opcode)), LookupOpcodeName(Opcodes(opcode)), false);
+ sLog->outInfo(LOG_FILTER_OPCODES, "C->S: %s 0x%.4X (%u)", LookupOpcodeName(Opcodes(opcode)), uint32(Opcodes(opcode)), uint32(Opcodes(opcode)));
try
{
diff --git a/src/server/shared/Logging/Appender.cpp b/src/server/shared/Logging/Appender.cpp
index 7950e045201..348ec4b3c7c 100644
--- a/src/server/shared/Logging/Appender.cpp
+++ b/src/server/shared/Logging/Appender.cpp
@@ -98,7 +98,7 @@ void Appender::write(LogMessage& message)
message.prefix.push_back(' ');
char text[MAX_QUERY_LEN];
- snprintf(text, MAX_QUERY_LEN, "[%-15s]", Appender::getLogFilterTypeString(message.type));
+ snprintf(text, MAX_QUERY_LEN, "[%s]", Appender::getLogFilterTypeString(message.type));
message.prefix.append(text);
}
@@ -172,13 +172,13 @@ char const* Appender::getLogFilterTypeString(LogFilterType type)
case LOG_FILTER_PLAYER:
return "PLAYER";
case LOG_FILTER_PLAYER_LOADING:
- return "PLAYER_LOADING";
+ return "PLAYER LOADING";
case LOG_FILTER_PLAYER_ITEMS:
- return "PLAYER_ITEMS";
+ return "PLAYER ITEMS";
case LOG_FILTER_PLAYER_SKILLS:
- return "PLAYER_SKILLS";
+ return "PLAYER SKILLS";
case LOG_FILTER_PLAYER_CHATLOG:
- return "PLAYER_CHATLOG";
+ return "PLAYER CHATLOG";
case LOG_FILTER_LOOT:
return "LOOT";
case LOG_FILTER_GUILD:
@@ -209,8 +209,14 @@ char const* Appender::getLogFilterTypeString(LogFilterType type)
return "SQL DRIVER";
case LOG_FILTER_SQL_DEV:
return "SQL DEV";
+ case LOG_FILTER_PLAYER_DUMP:
+ return "PLAYER DUMP";
+ case LOG_FILTER_BATTLEFIELD:
+ return "BATTLEFIELD";
+ case LOG_FILTER_SERVER_LOADING:
+ return "SERVER LOADING";
case LOG_FILTER_OPCODES:
- return "OPCODES";
+ return "OPCODE";
default:
break;
}
diff --git a/src/server/shared/Logging/Appender.h b/src/server/shared/Logging/Appender.h
index 56662bbee15..09ec8bfd081 100644
--- a/src/server/shared/Logging/Appender.h
+++ b/src/server/shared/Logging/Appender.h
@@ -65,12 +65,12 @@ enum LogFilterType
LOG_FILTER_SQL_DEV,
LOG_FILTER_PLAYER_DUMP,
LOG_FILTER_BATTLEFIELD,
- LOG_FILTER_OPCODES,
+ LOG_FILTER_SERVER_LOADING,
+ LOG_FILTER_OPCODES
};
const uint8 MaxLogFilter = uint8(LOG_FILTER_OPCODES) + 1;
-
// Values assigned have their equivalent in enum ACE_Log_Priority
enum LogLevel
{
diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index 82fb5b9461e..8e740ba83b8 100644
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -486,14 +486,6 @@ void Log::outCommand(uint32 account, const char * str, ...)
write(msg);
}
-void Log::outOpCode(uint32 op, const char* name, bool smsg)
-{
- if (!ShouldLog(LOG_FILTER_OPCODES, LOG_LEVEL_DEBUG))
- return;
-
- outInfo(LOG_FILTER_OPCODES, "%s: %s 0x%.4X (%u)", smsg ? "S->C" : "C->S", name, op, op);
-}
-
void Log::SetRealmID(uint32 id)
{
realm = id;
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index 2089b969e1a..61700de050b 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -2627,19 +2627,25 @@ PlayerDump.DisallowOverwrite = 1
# w - (Overwrite)
#
-Appender.Console=1,2,6
-Appender.Server=2,2,7,Server.log,w
-Appender.GM=2,2,7,GM_%s.log
-Appender.SQL=2,2,7,SQL.log
-Appender.DBErrors=2,2,7,DBErrors.log
-Appender.Char=2,2,7,Char.log,w
-Appender.CharDump=2,2,0,chardumps/%s.log
-Appender.RA=2,2,7,RA.log
-Appender.Arenas=2,2,7,Arena.log
+Appender.Console=1,5,0
+Appender.Server=2,2,0,Server.log,w
+Appender.GM=2,2,0,GM.log
+Appender.DBErrors=2,2,0,DBErrors.log
+Appender.Char=2,2,0,Char.log,w
+Appender.RA=2,2,0,RA.log
+Appender.Warden=2,2,0,Warden.log
+Appender.Chat=2,2,0,Chat.log
+Appender.CharDump=2,2,0,%s.log
+Appender.Arenas=2,2,0,Arena.log
Appender.SQLDev=2,2,0,SQLDev.log
-Appender.SQLDriver=2,2,7,SQLDriver.log
-Appender.Warden=2,2,7,Warden.log
-Appender.Chat=2,2,7,Chat.log
+Appender.SQLDriver=2,2,0,SQLDriver.log
+
+# Appenders
+# Description: List of Appenders to read from config
+# (Using spaces as separator).
+# Default: "Console Server GM DBErrors Char RA Warden Chat"
+
+Appenders=Console Server GM DBErrors Char RA Warden Chat
# Logger config values: Given a logger "name"
# Logger.name
@@ -2691,50 +2697,8 @@ Appender.Chat=2,2,7,Chat.log
# 37 - SQL Dev
# 38 - Player Dump
# 39 - Battlefield
-# 40 - Opcodes
-
-Logger.Root=0,3,Console Server
-Logger.Units=1,3,Console Server
-Logger.Pets=2,3,Console Server
-Logger.Vehicles=3,3,Console Server
-Logger.TCSR=4,3,Console Server
-Logger.AI=5,3,Console Server
-Logger.MapScripts=6,3,Console Server
-Logger.NetWork=7,3,Console Server
-Logger.Spells=8,3,Console Server
-Logger.Achievements=9,3,Console Server
-Logger.Conditions=10,3,Console Server
-Logger.Pool=11,3,Console Server
-Logger.AuctionHouse=12,3,Console Server
-Logger.Battlegrounds=13,3,Console Server
-Logger.OutdoorPvP=14,3,Console Server
-Logger.ChatSystem=15,3,Console Server
-Logger.LFG=16,3,Console Server
-Logger.Maps=17,3,Console Server
-Logger.Player=18,3,Console Server
-Logger.PlayerLoading=19,3,Console Server
-Logger.PlayerItems=20,3,Console Server
-Logger.PlayerSkills=21,3,Console Server
-Logger.PlayerChat=22,3,Chat
-Logger.Loot=23,3,Console Server
-Logger.Guilds=24,3,Console Server
-Logger.Transports=25,3,Console Server
-Logger.SQL=26,2,Console Server DBErrors
-Logger.GM=27,3,Console Server GM
-Logger.RA=28,3,RA
-Logger.Warden=29,3,Warden
-Logger.Authserver=30,3,Console Server
-Logger.Worldserver=31,3,Console Server
-Logger.GameEvents=32,3,Console Server
-Logger.Calendar=33,3,Console Server
-Logger.Character=34,3,Char
-Logger.Arenas=35,3,Arenas
-Logger.SQLDriver=36,5,SQLDriver
-Logger.SQLDev=37,3,SQLDev
-Logger.CharDump=38,5,CharDump
-Logger.Battlefield=39,3,Console Server
-Logger.Opcodes=40,2,Console Server
-
+# 40 - Server Loading
+# 41 - Opcodes (just id and name sent / received)
# LogLevel
# 0 - (Disabled)
# 1 - (Trace)
@@ -2747,17 +2711,24 @@ Logger.Opcodes=40,2,Console Server
# AppenderList: List of appenders linked to logger
# (Using spaces as separator).
#
-# Appenders
-# Description: List of Appenders to read from config
-# (Using spaces as separator).
-# Default: "Console Server"
-Appenders=Console Server GM Char Arenas Warden DBErrors CharDump
+Logger.Root=0,3,Console Server
+Logger.Chat=22,3,Chat
+Logger.DBErrors=26,5,Console Server DBErrors
+Logger.GM=27,3,Console Server GM
+Logger.RA=28,3,RA
+Logger.Warden=29,3,Warden
+Logger.Character=34,3,Char
+Logger.Arenas=35,3,Arenas
+Logger.SQLDriver=36,5,SQLDriver
+Logger.SQLDev=37,3,SQLDev
+Logger.CharDump=38,3,CharDump
+Logger.Load=40,3,Console Server
#
# Loggers
# Description: List of Loggers to read from config
# (Using spaces as separator).
-# Default: "root"
+# Default: "Root Chat DBErrors GM RA Warden Character Load"
-Loggers=Root GM Character Arenas Warden SQL
+Loggers=Root Chat DBErrors GM RA Warden Character Load