From 2532144c77e2e9b6fcb069fa414276cdb6d11fa3 Mon Sep 17 00:00:00 2001 From: wangxiaotian22 Date: Thu, 11 Mar 2021 11:18:52 +0800 Subject: [PATCH 1/2] revert get logheader --- inc/framework/common/debug/ge_log.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/inc/framework/common/debug/ge_log.h b/inc/framework/common/debug/ge_log.h index 45db7e93..02622f91 100644 --- a/inc/framework/common/debug/ge_log.h +++ b/inc/framework/common/debug/ge_log.h @@ -56,9 +56,9 @@ inline bool IsLogEnable(int module_name, int log_level) { return (enable == 1); } -#define GELOGE(ERROR_CODE, fmt, ...) \ - dlog_error(GE_MODULE_NAME, "%lu %s: ErrorNo: %d(%s) %s" fmt, GeLog::GetTid(), __FUNCTION__, ERROR_CODE, \ - ((GE_GET_ERRORNO_STR(ERROR_CODE)).c_str()), ErrorManager::GetInstance().GetLogHeader().c_str(), \ +#define GELOGE(ERROR_CODE, fmt, ...) \ + dlog_error(GE_MODULE_NAME, "%lu %s: ErrorNo: %d(%s) " fmt, GeLog::GetTid(), __FUNCTION__, ERROR_CODE, \ + ((GE_GET_ERRORNO_STR(ERROR_CODE)).c_str()), \ ##__VA_ARGS__) #define GELOGW(fmt, ...) \ if (IsLogEnable(GE_MODULE_NAME, DLOG_WARN)) \ From bcd0fc51116b57e5ca39b687941aaf95ebfc766f Mon Sep 17 00:00:00 2001 From: wangxiaotian22 Date: Thu, 11 Mar 2021 11:25:51 +0800 Subject: [PATCH 2/2] modify clang --- inc/framework/common/debug/ge_log.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/inc/framework/common/debug/ge_log.h b/inc/framework/common/debug/ge_log.h index 02622f91..7b78c406 100644 --- a/inc/framework/common/debug/ge_log.h +++ b/inc/framework/common/debug/ge_log.h @@ -58,8 +58,7 @@ inline bool IsLogEnable(int module_name, int log_level) { #define GELOGE(ERROR_CODE, fmt, ...) \ dlog_error(GE_MODULE_NAME, "%lu %s: ErrorNo: %d(%s) " fmt, GeLog::GetTid(), __FUNCTION__, ERROR_CODE, \ - ((GE_GET_ERRORNO_STR(ERROR_CODE)).c_str()), \ - ##__VA_ARGS__) + ((GE_GET_ERRORNO_STR(ERROR_CODE)).c_str()), ##__VA_ARGS__) #define GELOGW(fmt, ...) \ if (IsLogEnable(GE_MODULE_NAME, DLOG_WARN)) \ dlog_warn(GE_MODULE_NAME, "%lu %s:" fmt, GeLog::GetTid(), __FUNCTION__, ##__VA_ARGS__)