From 4c459a004e475d4e3c885a0e5a1409d85ac2c553 Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 10 Sep 2020 11:07:21 +0800 Subject: [PATCH] Log: Support tag for log --- trunk/src/app/srs_app_rtc_source.cpp | 2 +- trunk/src/kernel/srs_kernel_log.hpp | 32 +++++++++----------------- trunk/src/main/srs_main_server.cpp | 2 +- trunk/src/protocol/srs_service_log.cpp | 8 +++---- 4 files changed, 17 insertions(+), 27 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_source.cpp b/trunk/src/app/srs_app_rtc_source.cpp index 7d6d1e529..393ba629d 100644 --- a/trunk/src/app/srs_app_rtc_source.cpp +++ b/trunk/src/app/srs_app_rtc_source.cpp @@ -1825,7 +1825,7 @@ srs_error_t SrsRtcVideoRecvTrack::check_send_nacks() return err; } - srs_trace("[Maybe] RTC: NACK timeout=%u, request PLI, track=%s, ssrc=%u", timeout_nacks, + srs_trace2("MAYBE", "RTC: NACK timeout=%u, request PLI, track=%s, ssrc=%u", timeout_nacks, track_desc_->id_.c_str(), track_desc_->ssrc_); return err; diff --git a/trunk/src/kernel/srs_kernel_log.hpp b/trunk/src/kernel/srs_kernel_log.hpp index 3d6122521..ca1cd9cd4 100644 --- a/trunk/src/kernel/srs_kernel_log.hpp +++ b/trunk/src/kernel/srs_kernel_log.hpp @@ -108,27 +108,17 @@ extern ISrsContext* _srs_context; // Log style. // Use __FUNCTION__ to print c method // Use __PRETTY_FUNCTION__ to print c++ class:method -#if 1 - #define srs_verbose(msg, ...) _srs_log->verbose(NULL, _srs_context->get_id(), msg, ##__VA_ARGS__) - #define srs_info(msg, ...) _srs_log->info(NULL, _srs_context->get_id(), msg, ##__VA_ARGS__) - #define srs_trace(msg, ...) _srs_log->trace(NULL, _srs_context->get_id(), msg, ##__VA_ARGS__) - #define srs_warn(msg, ...) _srs_log->warn(NULL, _srs_context->get_id(), msg, ##__VA_ARGS__) - #define srs_error(msg, ...) _srs_log->error(NULL, _srs_context->get_id(), msg, ##__VA_ARGS__) -#endif -#if 0 - #define srs_verbose(msg, ...) _srs_log->verbose(__FUNCTION__, _srs_context->get_id(), msg, ##__VA_ARGS__) - #define srs_info(msg, ...) _srs_log->info(__FUNCTION__, _srs_context->get_id(), msg, ##__VA_ARGS__) - #define srs_trace(msg, ...) _srs_log->trace(__FUNCTION__, _srs_context->get_id(), msg, ##__VA_ARGS__) - #define srs_warn(msg, ...) _srs_log->warn(__FUNCTION__, _srs_context->get_id(), msg, ##__VA_ARGS__) - #define srs_error(msg, ...) _srs_log->error(__FUNCTION__, _srs_context->get_id(), msg, ##__VA_ARGS__) -#endif -#if 0 - #define srs_verbose(msg, ...) _srs_log->verbose(__PRETTY_FUNCTION__, _srs_context->get_id(), msg, ##__VA_ARGS__) - #define srs_info(msg, ...) _srs_log->info(__PRETTY_FUNCTION__, _srs_context->get_id(), msg, ##__VA_ARGS__) - #define srs_trace(msg, ...) _srs_log->trace(__PRETTY_FUNCTION__, _srs_context->get_id(), msg, ##__VA_ARGS__) - #define srs_warn(msg, ...) _srs_log->warn(__PRETTY_FUNCTION__, _srs_context->get_id(), msg, ##__VA_ARGS__) - #define srs_error(msg, ...) _srs_log->error(__PRETTY_FUNCTION__, _srs_context->get_id(), msg, ##__VA_ARGS__) -#endif +#define srs_verbose(msg, ...) _srs_log->verbose(NULL, _srs_context->get_id(), msg, ##__VA_ARGS__) +#define srs_info(msg, ...) _srs_log->info(NULL, _srs_context->get_id(), msg, ##__VA_ARGS__) +#define srs_trace(msg, ...) _srs_log->trace(NULL, _srs_context->get_id(), msg, ##__VA_ARGS__) +#define srs_warn(msg, ...) _srs_log->warn(NULL, _srs_context->get_id(), msg, ##__VA_ARGS__) +#define srs_error(msg, ...) _srs_log->error(NULL, _srs_context->get_id(), msg, ##__VA_ARGS__) +// With tag. +#define srs_verbose2(tag, msg, ...) _srs_log->verbose(tag, _srs_context->get_id(), msg, ##__VA_ARGS__) +#define srs_info2(tag, msg, ...) _srs_log->info(tag, _srs_context->get_id(), msg, ##__VA_ARGS__) +#define srs_trace2(tag, msg, ...) _srs_log->trace(tag, _srs_context->get_id(), msg, ##__VA_ARGS__) +#define srs_warn2(tag, msg, ...) _srs_log->warn(tag, _srs_context->get_id(), msg, ##__VA_ARGS__) +#define srs_error2(tag, msg, ...) _srs_log->error(tag, _srs_context->get_id(), msg, ##__VA_ARGS__) // TODO: FIXME: Add more verbose and info logs. #ifndef SRS_VERBOSE diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index 6ec4d01f7..c1d25ae7b 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -134,7 +134,7 @@ srs_error_t do_main(int argc, char** argv) } // config already applied to log. - srs_trace("%s, %s", RTMP_SIG_SRS_SERVER, RTMP_SIG_SRS_LICENSE); + srs_trace2("MAIN", "%s, %s", RTMP_SIG_SRS_SERVER, RTMP_SIG_SRS_LICENSE); srs_trace("authors: %s", RTMP_SIG_SRS_AUTHORS); srs_trace("contributors: %s", SRS_CONSTRIBUTORS); srs_trace("cwd=%s, work_dir=%s, build: %s, configure: %s, uname: %s, osx: %d", diff --git a/trunk/src/protocol/srs_service_log.cpp b/trunk/src/protocol/srs_service_log.cpp index baf9f5f4f..5dafb4c05 100644 --- a/trunk/src/protocol/srs_service_log.cpp +++ b/trunk/src/protocol/srs_service_log.cpp @@ -240,9 +240,9 @@ bool srs_log_header(char* buffer, int size, bool utc, bool dangerous, const char if (dangerous) { if (tag) { written = snprintf(buffer, size, - "[%d-%02d-%02d %02d:%02d:%02d.%03d][%s][%s][%d][%s][%d] ", + "[%d-%02d-%02d %02d:%02d:%02d.%03d][%s][%d][%s][%d][%s] ", 1900 + tm->tm_year, 1 + tm->tm_mon, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, (int)(tv.tv_usec / 1000), - level, tag, getpid(), cid.c_str(), errno); + level, getpid(), cid.c_str(), errno, tag); } else { written = snprintf(buffer, size, "[%d-%02d-%02d %02d:%02d:%02d.%03d][%s][%d][%s][%d] ", @@ -252,9 +252,9 @@ bool srs_log_header(char* buffer, int size, bool utc, bool dangerous, const char } else { if (tag) { written = snprintf(buffer, size, - "[%d-%02d-%02d %02d:%02d:%02d.%03d][%s][%s][%d][%s] ", + "[%d-%02d-%02d %02d:%02d:%02d.%03d][%s][%d][%s][%s] ", 1900 + tm->tm_year, 1 + tm->tm_mon, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec, (int)(tv.tv_usec / 1000), - level, tag, getpid(), cid.c_str()); + level, getpid(), cid.c_str(), tag); } else { written = snprintf(buffer, size, "[%d-%02d-%02d %02d:%02d:%02d.%03d][%s][%d][%s] ",