diff options
author | Kyle Phelps <kphelps@users.noreply.github.com> | 2021-01-08 17:33:07 -0500 |
---|---|---|
committer | jackpoz <giacomopoz@gmail.com> | 2021-01-08 23:40:59 +0100 |
commit | 817bd92a2ae4f9c107961c9ac0d8e109f4b46be7 (patch) | |
tree | 07e66043f2767493a63929c12daa17f34d38ea15 /src | |
parent | a225717b99b6d1befcfe40f3001bfb1efcf8a9d8 (diff) |
Split all addon chat logs into separate log streams (#25816)
* Split all addon chat logs into separate log streams
* Add missing channels
(cherry picked from commit ee6e71bbd3338042a3bb56574e7952df52a69f19)
# Conflicts:
# src/server/scripts/World/chat_log.cpp
Diffstat (limited to 'src')
-rw-r--r-- | src/server/scripts/World/chat_log.cpp | 72 |
1 files changed, 31 insertions, 41 deletions
diff --git a/src/server/scripts/World/chat_log.cpp b/src/server/scripts/World/chat_log.cpp index c2e8c7ba0f4..be353a82a19 100644 --- a/src/server/scripts/World/chat_log.cpp +++ b/src/server/scripts/World/chat_log.cpp @@ -22,6 +22,12 @@ #include "Log.h" #include "Player.h" +#define TC_LOG_CHAT(TYPE, ...) \ + if (lang != LANG_ADDON) \ + TC_LOG_DEBUG("chat.log." TYPE, __VA_ARGS__); \ + else \ + TC_LOG_DEBUG("chat.log.addon." TYPE, __VA_ARGS__); + class ChatLogScript : public PlayerScript { public: @@ -32,17 +38,17 @@ class ChatLogScript : public PlayerScript switch (type) { case CHAT_MSG_SAY: - TC_LOG_DEBUG("chat.log.say", "Player %s says (language %u): %s", + TC_LOG_CHAT("say", "Player %s says (language %u): %s", player->GetName().c_str(), lang, msg.c_str()); break; case CHAT_MSG_EMOTE: - TC_LOG_DEBUG("chat.log.emote", "Player %s emotes: %s", + TC_LOG_CHAT("emote", "Player %s emotes: %s", player->GetName().c_str(), msg.c_str()); break; case CHAT_MSG_YELL: - TC_LOG_DEBUG("chat.log.yell", "Player %s yells (language %u): %s", + TC_LOG_CHAT("yell", "Player %s yells (language %u): %s", player->GetName().c_str(), lang, msg.c_str()); break; } @@ -50,12 +56,8 @@ class ChatLogScript : public PlayerScript void OnChat(Player* player, uint32 /*type*/, uint32 lang, std::string& msg, Player* receiver) override { - if (lang != LANG_ADDON) - TC_LOG_DEBUG("chat.log.whisper", "Player %s tells %s: %s", - player->GetName().c_str(), receiver ? receiver->GetName().c_str() : "<unknown>", msg.c_str()); - else - TC_LOG_DEBUG("chat.log.addon.whisper", "Player %s tells %s: %s", - player->GetName().c_str(), receiver ? receiver->GetName().c_str() : "<unknown>", msg.c_str()); + TC_LOG_CHAT("whisper", "Player %s tells %s: %s", + player->GetName().c_str(), receiver ? receiver->GetName().c_str() : "<unknown>", msg.c_str()); } void OnChat(Player* player, uint32 type, uint32 lang, std::string& msg, Group* group) override @@ -65,49 +67,37 @@ class ChatLogScript : public PlayerScript switch (type) { case CHAT_MSG_PARTY: - if (lang != LANG_ADDON) - TC_LOG_DEBUG("chat.log.party", "Player %s tells group with leader %s: %s", - player->GetName().c_str(), group ? group->GetLeaderName() : "<unknown>", msg.c_str()); - else - TC_LOG_DEBUG("chat.log.addon.party", "Player %s tells group with leader %s: %s", - player->GetName().c_str(), group ? group->GetLeaderName() : "<unknown>", msg.c_str()); + TC_LOG_CHAT("party", "Player %s tells group with leader %s: %s", + player->GetName().c_str(), group ? group->GetLeaderName() : "<unknown>", msg.c_str()); break; case CHAT_MSG_PARTY_LEADER: - TC_LOG_DEBUG("chat.log.party", "Leader %s tells group: %s", + TC_LOG_CHAT("party", "Leader %s tells group: %s", player->GetName().c_str(), msg.c_str()); break; case CHAT_MSG_RAID: - if (lang != LANG_ADDON) - TC_LOG_DEBUG("chat.log.raid", "Player %s tells raid with leader %s: %s", - player->GetName().c_str(), group ? group->GetLeaderName() : "<unknown>", msg.c_str()); - else - TC_LOG_DEBUG("chat.log.addon.raid", "Player %s tells raid with leader %s: %s", - player->GetName().c_str(), group ? group->GetLeaderName() : "<unknown>", msg.c_str()); + TC_LOG_CHAT("raid", "Player %s tells raid with leader %s: %s", + player->GetName().c_str(), group ? group->GetLeaderName() : "<unknown>", msg.c_str()); break; case CHAT_MSG_RAID_LEADER: - TC_LOG_DEBUG("chat.log.raid", "Leader player %s tells raid: %s", + TC_LOG_CHAT("raid", "Leader player %s tells raid: %s", player->GetName().c_str(), msg.c_str()); break; case CHAT_MSG_RAID_WARNING: - TC_LOG_DEBUG("chat.log.raid", "Leader player %s warns raid with: %s", + TC_LOG_CHAT("raid", "Leader player %s warns raid with: %s", player->GetName().c_str(), msg.c_str()); break; case CHAT_MSG_BATTLEGROUND: - if (lang != LANG_ADDON) - TC_LOG_DEBUG("chat.log.bg", "Player %s tells battleground with leader %s: %s", - player->GetName().c_str(), group ? group->GetLeaderName() : "<unknown>", msg.c_str()); - else - TC_LOG_DEBUG("chat.log.addon.bg", "Player %s tells battleground with leader %s: %s", - player->GetName().c_str(), group ? group->GetLeaderName() : "<unknown>", msg.c_str()); + TC_LOG_CHAT("bg", "Player %s tells battleground with leader %s: %s", + player->GetName().c_str(), group ? group->GetLeaderName() : "<unknown>", msg.c_str()); break; case CHAT_MSG_BATTLEGROUND_LEADER: - TC_LOG_DEBUG("chat.log.bg", "Leader player %s tells battleground: %s", + TC_LOG_CHAT("bg", "Leader player %s tells battleground: %s", player->GetName().c_str(), msg.c_str()); break; } @@ -118,22 +108,18 @@ class ChatLogScript : public PlayerScript switch (type) { case CHAT_MSG_GUILD: - if (lang != LANG_ADDON) - TC_LOG_DEBUG("chat.log.guild", "Player %s tells guild %s: %s", - player->GetName().c_str(), guild ? guild->GetName().c_str() : "<unknown>", msg.c_str()); - else - TC_LOG_DEBUG("chat.log.addon.guild", "Player %s sends to guild %s: %s", - player->GetName().c_str(), guild ? guild->GetName().c_str() : "<unknown>", msg.c_str()); + TC_LOG_CHAT("guild", "Player %s tells guild %s: %s", + player->GetName().c_str(), guild ? guild->GetName().c_str() : "<unknown>", msg.c_str()); break; case CHAT_MSG_OFFICER: - TC_LOG_DEBUG("chat.log.guild.officer", "Player %s tells guild %s officers: %s", + TC_LOG_CHAT("guild.officer", "Player %s tells guild %s officers: %s", player->GetName().c_str(), guild ? guild->GetName().c_str() : "<unknown>", msg.c_str()); break; } } - void OnChat(Player* player, uint32 /*type*/, uint32 /*lang*/, std::string& msg, Channel* channel) override + void OnChat(Player* player, uint32 /*type*/, uint32 lang, std::string& msg, Channel* channel) override { bool isSystem = channel && (channel->HasFlag(CHANNEL_FLAG_TRADE) || @@ -142,12 +128,14 @@ class ChatLogScript : public PlayerScript channel->HasFlag(CHANNEL_FLAG_LFG)); if (isSystem) - TC_LOG_DEBUG("chat.log.system", "Player %s tells channel %s: %s", + { + TC_LOG_CHAT("system", "Player %s tells channel %s: %s", player->GetName().c_str(), channel->GetName().c_str(), msg.c_str()); + } else { std::string channelName = channel ? channel->GetName() : "<unknown>"; - TC_LOG_DEBUG("chat.log.channel." + channelName, "Player %s tells channel %s: %s", + TC_LOG_CHAT("channel." + channelName, "Player %s tells channel %s: %s", player->GetName().c_str(), channelName.c_str(), msg.c_str()); } } @@ -157,3 +145,5 @@ void AddSC_chat_log() { new ChatLogScript(); } + +#undef TC_LOG_CHAT |