mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2026-01-01 07:37:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Sync] Some minor cross project sync

Browse source
This commit is contained in:
Antz 2020-01-09 08:30:20 +00:00
parent 4f8b995d89
commit 49fe617b55
16 changed files with 212 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/shared/Log/Log.cpp
View file

@ -118,27 +118,21 @@ void Log::SetColor(bool stdout_stream, Color color)
static WORD WinColorFG[Color_count] =
{
0, // BLACK
FOREGROUND_RED, // RED
FOREGROUND_GREEN, // GREEN
FOREGROUND_RED | FOREGROUND_GREEN, // BROWN
FOREGROUND_BLUE, // BLUE
FOREGROUND_RED | FOREGROUND_BLUE, // MAGENTA
FOREGROUND_GREEN | FOREGROUND_BLUE, // CYAN
FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE,// WHITE
// YELLOW
FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY,
// RED_BOLD
FOREGROUND_RED | FOREGROUND_INTENSITY,
// GREEN_BOLD
FOREGROUND_GREEN | FOREGROUND_INTENSITY,
FOREGROUND_BLUE | FOREGROUND_INTENSITY, // BLUE_BOLD
// MAGENTA_BOLD
FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
// CYAN_BOLD
FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
// WHITE_BOLD
FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY
0, // BLACK
FOREGROUND_RED, // RED
FOREGROUND_GREEN, // GREEN
FOREGROUND_RED | FOREGROUND_GREEN, // BROWN
FOREGROUND_BLUE, // BLUE
FOREGROUND_RED | FOREGROUND_BLUE, // MAGENTA
FOREGROUND_GREEN | FOREGROUND_BLUE, // CYAN
FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE, // WHITE
FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY, // YELLOW
FOREGROUND_RED | FOREGROUND_INTENSITY, // RED_BOLD
FOREGROUND_GREEN | FOREGROUND_INTENSITY, // GREEN_BOLD
FOREGROUND_BLUE | FOREGROUND_INTENSITY, // BLUE_BOLD
FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY, // MAGENTA_BOLD
FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY, // CYAN_BOLD
FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY // WHITE_BOLD
};
HANDLE hConsole = GetStdHandle(stdout_stream ? STD_OUTPUT_HANDLE : STD_ERROR_HANDLE);
@ -779,6 +773,7 @@ void Log::outDetail(const char* str, ...)
void Log::outDebug(const char* str, ...)
{
#ifdef MANGOS_DEBUG
if (!str)
{ return; }
@ -815,6 +810,7 @@ void Log::outDebug(const char* str, ...)
}
fflush(stdout);
#endif
}
void Log::outCommand(uint32 account, const char* str, ...)

9
src/shared/Log/Log.h
View file

@ -495,17 +495,22 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th
sLog.outDetail(__VA_ARGS__); \
} while(0)
#define DEBUG_LOG(...) \
#ifdef MANGOS_DEBUG
#define DEBUG_LOG(...) \
do { \
if (sLog.HasLogLevelOrHigher(LOG_LVL_DEBUG)) \
sLog.outDebug(__VA_ARGS__); \
} while(0)
#define DEBUG_FILTER_LOG(F,...) \
#define DEBUG_FILTER_LOG(F,...) \
do { \
if (sLog.HasLogLevelOrHigher(LOG_LVL_DEBUG) && !sLog.HasLogFilter(F)) \
sLog.outDebug(__VA_ARGS__); \
} while(0)
#else
#define DEBUG_LOG(...)
#define DEBUG_FILTER_LOG(F,...)
#endif
#define ERROR_DB_FILTER_LOG(F,...) \
do { \