lib/wsrep-lib
1
0
Fork 0
mirror of https://github.com/codership/wsrep-lib.git synced 2025-07-21 12:22:06 +03:00
Code Activity

Add prefix argument to logger callback.

Browse Source 
Refs codership/wsrep-lib#148
This commit is contained in:
Alexey Yurchenko
2020-12-11 12:24:33 +02:00
parent dcf3ce91cd
commit 515ac816f9
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wsrep/logger.hpp
View File

@ -42,7 +42,8 @@ namespace wsrep
debug, debug,
info, info,
warning, warning,
error error,
unknown
}; };
enum debug_level enum debug_level
@ -55,8 +56,12 @@ namespace wsrep
/** /**
* Signature for user defined logger callback function. * Signature for user defined logger callback function.
*
* @param pfx optional internally defined prefix for the message
* @param msg message to log
*/ */
typedef void (*logger_fn_type)(level, const char*); typedef void (*logger_fn_type)(level l,
const char* pfx, const char* msg);
static const char* to_c_string(enum level level) static const char* to_c_string(enum level level)
{ {
@ -66,11 +71,12 @@ namespace wsrep
case info: return "info"; case info: return "info";
case warning: return "warning"; case warning: return "warning";
case error: return "error"; case error: return "error";
case unknown: break;
}; };
return "unknown"; return "unknown";
} }
log(enum wsrep::log::level level, const char* prefix = "") log(enum wsrep::log::level level, const char* prefix = "L:")
: level_(level) : level_(level)
, prefix_(prefix) , prefix_(prefix)
, oss_() , oss_()
@ -80,12 +86,12 @@ namespace wsrep
{ {
if (logger_fn_) if (logger_fn_)
{ {
logger_fn_(level_, oss_.str().c_str()); logger_fn_(level_, prefix_, oss_.str().c_str());
} }
else else
{ {
wsrep::unique_lock<wsrep::mutex> lock(mutex_); wsrep::unique_lock<wsrep::mutex> lock(mutex_);
os_ << prefix_ << ": " << oss_.str() << std::endl; os_ << prefix_ << oss_.str() << std::endl;
} }
} }

11
src/wsrep_provider_v26.cpp
View File

@ -564,22 +564,25 @@ namespace
void logger_cb(wsrep_log_level_t level, const char* msg) void logger_cb(wsrep_log_level_t level, const char* msg)
{ {
static const char* const pfx("P:"); // "provider"
wsrep::log::level ll(wsrep::log::unknown);
switch (level) switch (level)
{ {
case WSREP_LOG_FATAL: case WSREP_LOG_FATAL:
case WSREP_LOG_ERROR: case WSREP_LOG_ERROR:
wsrep::log_error() << msg; ll = wsrep::log::error;
break; break;
case WSREP_LOG_WARN: case WSREP_LOG_WARN:
wsrep::log_warning() << msg; ll = wsrep::log::warning;
break; break;
case WSREP_LOG_INFO: case WSREP_LOG_INFO:
wsrep::log_info() << msg; ll = wsrep::log::info;
break; break;
case WSREP_LOG_DEBUG: case WSREP_LOG_DEBUG:
wsrep::log_debug() << msg; ll = wsrep::log::debug;
break; break;
} }
wsrep::log(ll, pfx) << msg;
} }
static int init_thread_service(void* dlh, static int init_thread_service(void* dlh,

3
test/wsrep-lib_test.cpp
View File

@ -44,9 +44,10 @@ static std::string debug_log_level;
static void log_fn(wsrep::log::level level, static void log_fn(wsrep::log::level level,
const char* pfx,
const char* msg) const char* msg)
{ {
log_file << wsrep::log::to_c_string(level) << ": " << msg << std::endl; log_file << wsrep::log::to_c_string(level) << " " << pfx << msg << std::endl;
} }
static bool parse_arg(const std::string& arg) static bool parse_arg(const std::string& arg)