88extern "C" {
99#endif
1010
11- #define LOG_APP_TYPE "M"
12- #define LOG_APP_NAME "content_redirect"
11+ #define LOG_APP_TYPE "M"
12+ #define LOG_APP_NAME "content_redirect"
1313
14- #define __FILENAME_X__ (strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__)
15- #define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILENAME_X__)
14+ #define __FILENAME_X__ (strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__)
15+ #define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILENAME_X__)
1616
17- #define LOG (LOG_FUNC , FMT , ARGS ...) LOG_EX_DEFAULT(LOG_FUNC, "", "", FMT, ##ARGS)
17+ #define LOG (LOG_FUNC , FMT , ARGS ...) LOG_EX_DEFAULT(LOG_FUNC, "" , "", "", FMT, ##ARGS)
1818
19- #define LOG_EX_DEFAULT (LOG_FUNC , LOG_LEVEL , LINE_END , FMT , ARGS ...) LOG_EX(__FILENAME__, __FUNCTION__, __LINE__, LOG_FUNC, LOG_LEVEL, LINE_END, FMT, ##ARGS)
19+ #define CONSOLE_COLOR_RED "\033[31m"
20+ #define CONSOLE_COLOR_YELLOW "\033[33m"
21+ #define CONSOLE_COLOR_CYAN "\033[36m"
22+ #define CONSOLE_COLOR_RESET "\033[0m"
2023
21- #define LOG_EX (FILENAME , FUNCTION , LINE , LOG_FUNC , LOG_LEVEL , LINE_END , FMT , ARGS ...) \
22- do { \
23- LOG_FUNC("[(%s)%18s][%23s]%30s@L%04d: " LOG_LEVEL "" FMT "" LINE_END, LOG_APP_TYPE, LOG_APP_NAME, FILENAME, FUNCTION, LINE, ##ARGS); \
24+ #define LOG_EX_DEFAULT (LOG_FUNC , LOG_COLOR , LOG_LEVEL , LINE_END , FMT , ARGS ...) LOG_EX(__FILENAME__, __FUNCTION__, __LINE__, LOG_FUNC, LOG_COLOR, LOG_LEVEL, LINE_END, FMT, ##ARGS)
25+
26+ #define LOG_EX (FILENAME , FUNCTION , LINE , LOG_FUNC , LOG_COLOR , LOG_LEVEL , LINE_END , FMT , ARGS ...) \
27+ do { \
28+ LOG_FUNC(LOG_COLOR "[(%s)%18s][%23s]%30s@L%04d: " LOG_LEVEL "" FMT "" LINE_END, LOG_APP_TYPE, LOG_APP_NAME, FILENAME, FUNCTION, LINE, ##ARGS); \
2429 } while (0)
2530
2631#ifdef DEBUG
@@ -37,11 +42,11 @@ extern "C" {
3742
3843#define DEBUG_FUNCTION_LINE_WRITE (FMT , ARGS ...) LOG(WHBLogWritef, FMT, ##ARGS)
3944
40- #define DEBUG_FUNCTION_LINE_ERR (FMT , ARGS ...) LOG_EX_DEFAULT(WHBLogPrintf, "##ERROR## ", "" , FMT, ##ARGS)
41- #define DEBUG_FUNCTION_LINE_WARN (FMT , ARGS ...) LOG_EX_DEFAULT(WHBLogPrintf, "##WARN ## ", "" , FMT, ##ARGS)
42- #define DEBUG_FUNCTION_LINE_INFO (FMT , ARGS ...) LOG_EX_DEFAULT(WHBLogPrintf, "##INFO ## ", "" , FMT, ##ARGS)
45+ #define DEBUG_FUNCTION_LINE_ERR (FMT , ARGS ...) LOG_EX_DEFAULT(WHBLogPrintf, CONSOLE_COLOR_RED, "## ERROR## ", CONSOLE_COLOR_RESET , FMT, ##ARGS)
46+ #define DEBUG_FUNCTION_LINE_WARN (FMT , ARGS ...) LOG_EX_DEFAULT(WHBLogPrintf, CONSOLE_COLOR_YELLOW, "##WARN ## ", CONSOLE_COLOR_RESET , FMT, ##ARGS)
47+ #define DEBUG_FUNCTION_LINE_INFO (FMT , ARGS ...) LOG_EX_DEFAULT(WHBLogPrintf, CONSOLE_COLOR_CYAN, "##INFO ## ", CONSOLE_COLOR_RESET , FMT, ##ARGS)
4348
44- #define DEBUG_FUNCTION_LINE_ERR_LAMBDA (FILENAME , FUNCTION , LINE , FMT , ARGS ...) LOG_EX(FILENAME, FUNCTION, LINE, WHBLogPrintf, "##ERROR## ", "" , FMT, ##ARGS);
49+ #define DEBUG_FUNCTION_LINE_ERR_LAMBDA (FILENAME , FUNCTION , LINE , FMT , ARGS ...) LOG_EX(FILENAME, FUNCTION, LINE, WHBLogPrintf, CONSOLE_COLOR_RED, "##ERROR## ", CONSOLE_COLOR_RESET , FMT, ##ARGS);
4550
4651#else
4752
@@ -53,11 +58,11 @@ extern "C" {
5358
5459#define DEBUG_FUNCTION_LINE_WRITE (FMT , ARGS ...) while (0)
5560
56- #define DEBUG_FUNCTION_LINE_ERR (FMT , ARGS ...) LOG_EX_DEFAULT(OSReport, "##ERROR## ", "\n", FMT, ##ARGS)
57- #define DEBUG_FUNCTION_LINE_WARN (FMT , ARGS ...) LOG_EX_DEFAULT(OSReport, "##WARN ## ", "\n", FMT, ##ARGS)
58- #define DEBUG_FUNCTION_LINE_INFO (FMT , ARGS ...) LOG_EX_DEFAULT(OSReport, "##INFO ## ", "\n", FMT, ##ARGS)
61+ #define DEBUG_FUNCTION_LINE_ERR (FMT , ARGS ...) LOG_EX_DEFAULT(OSReport, CONSOLE_COLOR_RED, "##ERROR## ", CONSOLE_COLOR_RESET "\n", FMT, ##ARGS)
62+ #define DEBUG_FUNCTION_LINE_WARN (FMT , ARGS ...) LOG_EX_DEFAULT(OSReport, CONSOLE_COLOR_YELLOW, "##WARN ## ", CONSOLE_COLOR_RESET "\n", FMT, ##ARGS)
63+ #define DEBUG_FUNCTION_LINE_INFO (FMT , ARGS ...) LOG_EX_DEFAULT(OSReport, CONSOLE_COLOR_CYAN, "##INFO ## ", CONSOLE_COLOR_RESET "\n", FMT, ##ARGS)
5964
60- #define DEBUG_FUNCTION_LINE_ERR_LAMBDA (FILENAME , FUNCTION , LINE , FMT , ARGS ...) LOG_EX(FILENAME, FUNCTION, LINE, OSReport, "##ERROR## ", "\n", FMT, ##ARGS);
65+ #define DEBUG_FUNCTION_LINE_ERR_LAMBDA (FILENAME , FUNCTION , LINE , FMT , ARGS ...) LOG_EX(FILENAME, FUNCTION, LINE, OSReport, CONSOLE_COLOR_RED, "##ERROR## ", CONSOLE_COLOR_RESET "\n", FMT, ##ARGS);
6166
6267#endif
6368
0 commit comments