amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-25 20:27:34 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

整理日志接口

Browse Source
This commit is contained in:
ziyue 2021-10-18 16:02:14 +08:00
parent 5d9f05669e
commit a8e61010cf
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdpart/ZLToolKit

@ -1 +1 @@
Subproject commit be74074d382a43e970de05fe88f412e5a05e38d6 Subproject commit ff70ca32dec78534633f6c7f586550e2e8004d1d

12
api/include/mk_util.h
View File

@ -65,12 +65,12 @@ API_EXPORT char* API_CALL mk_util_hex_dump(const void *buf, int len);
API_EXPORT void API_CALL mk_log_printf(int level, const char *file, const char *function, int line, const char *fmt, ...); API_EXPORT void API_CALL mk_log_printf(int level, const char *file, const char *function, int line, const char *fmt, ...);
// 以下宏可以替换printf使用 // 以下宏可以替换printf使用
#define log_trace(fmt,...) mk_log_printf(0,__FILE__,__FUNCTION__,__LINE__,fmt,##__VA_ARGS__) #define log_printf(lev, fmt, ...) mk_log_printf(lev, __FILE__, __FUNCTION__, __LINE__, fmt, ##__VA_ARGS__)
#define log_debug(fmt,...) mk_log_printf(1,__FILE__,__FUNCTION__,__LINE__,fmt,##__VA_ARGS__) #define log_trace(...) log_printf(0,##__VA_ARGS__)
#define log_info(fmt,...) mk_log_printf(2,__FILE__,__FUNCTION__,__LINE__,fmt,##__VA_ARGS__) #define log_debug(...) log_printf(1, ##__VA_ARGS__)
#define log_warn(fmt,...) mk_log_printf(3,__FILE__,__FUNCTION__,__LINE__,fmt,##__VA_ARGS__) #define log_info(...) log_printf(2, ##__VA_ARGS__)
#define log_error(fmt,...) mk_log_printf(4,__FILE__,__FUNCTION__,__LINE__,fmt,##__VA_ARGS__) #define log_warn(...) log_printf(3, ##__VA_ARGS__)
#define log_printf(lev,fmt,...) mk_log_printf(lev,__FILE__,__FUNCTION__,__LINE__,fmt,##__VA_ARGS__) #define log_error(...) log_printf(4, ##__VA_ARGS__)
#ifdef __cplusplus #ifdef __cplusplus
} }

8
api/source/mk_util.cpp
View File

@ -9,7 +9,6 @@
*/ */
#include "mk_util.h" #include "mk_util.h"
#include <stdarg.h>
#include <assert.h> #include <assert.h>
#include "Util/util.h" #include "Util/util.h"
#include "Util/logger.h" #include "Util/logger.h"
@ -46,14 +45,9 @@ API_EXPORT char* API_CALL mk_util_hex_dump(const void *buf, int len){
} }
API_EXPORT void API_CALL mk_log_printf(int level, const char *file, const char *function, int line, const char *fmt, ...) { API_EXPORT void API_CALL mk_log_printf(int level, const char *file, const char *function, int line, const char *fmt, ...) {
assert(file && function && fmt);
LogContextCapturer info(Logger::Instance(), (LogLevel) level, file, function, line);
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
char *str = nullptr; toolkit::printLog(getLogger(), level, file, function, line, fmt, ap);
vasprintf(&str, fmt, ap);
va_end(ap); va_end(ap);
info << str;
free(str);
} }