Skip to content

解决颜色覆盖问题和64位时间戳输出死机问题 #187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
F-0-0 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

解决颜色覆盖问题和64位时间戳输出死机问题 #187

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions extensions/log/log.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,19 @@ extern "C" {
* log级别字符(包含颜色)
*/
#if LOG_USING_COLOR == 1
#define ERROR_TEXT CSI(31) "E(%d) %s:" CSI(39) /**< 错误标签 */
#define WARNING_TEXT CSI(33) "W(%d) %s:" CSI(39) /**< 警告标签 */
#define INFO_TEXT CSI(32) "I(%d) %s:" CSI(39) /**< 信息标签 */
#define DEBUG_TEXT CSI(34) "D(%d) %s:" CSI(39) /**< 调试标签 */
#define VERBOSE_TEXT CSI(36) "V(%d) %s:" CSI(39) /**< 冗余信息标签 */
#define ERROR_TEXT CSI(31) "E(%lld) %s:" CSI(39) /**< 错误标签 */
#define WARNING_TEXT CSI(33) "W(%lld) %s:" CSI(39) /**< 警告标签 */
#define INFO_TEXT CSI(32) "I(%lld) %s:" CSI(39) /**< 信息标签 */
#define DEBUG_TEXT CSI(34) "D(%lld) %s:" CSI(39) /**< 调试标签 */
#define VERBOSE_TEXT CSI(36) "V(%lld) %s:" CSI(39) /**< 冗余信息标签 */
#define DEFAULT_TEXT CSI(39) /**< 颜色输出后恢复原色 */
#else
#define ERROR_TEXT "E(%d) %s:"
#define WARNING_TEXT "W(%d) %s:"
#define INFO_TEXT "I(%d) %s:"
#define DEBUG_TEXT "D(%d) %s:"
#define VERBOSE_TEXT "V(%d) %s:"
#define ERROR_TEXT "E(%lld) %s:"
#define WARNING_TEXT "W(%lld) %s:"
#define INFO_TEXT "I(%lld) %s:"
#define DEBUG_TEXT "D(%lld) %s:"
#define VERBOSE_TEXT "V(%lld) %s:"
#define DEFAULT_TEXT ""
#endif


Expand Down Expand Up @@ -142,7 +144,7 @@ typedef struct log_def
*/
#define logFormat(text, level, fmt, ...) \
if (LOG_ENABLE) {\
logWrite(LOG_ALL_OBJ, level, text " " fmt "" LOG_END, \
logWrite(LOG_ALL_OBJ, level, text " " fmt "" LOG_END DEFAULT_TEXT, \
LOG_TIME_STAMP, LOG_TAG, ##__VA_ARGS__); }

/**
Expand Down