hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A bitmask of logfiles is now only logged once.

Browse Source
This commit is contained in:
Johan Wikman
2015-11-03 11:05:01 +02:00
parent 9cd327a783
commit 6d1c069d41
1 changed files with 115 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
log_manager/log_manager.cc
View File

@ -1377,46 +1377,15 @@ static int log_write(logfile_id_t id,
const char* str,
enum log_flush flush)
{
int rv = 0;
int rv = -1;
if (logmanager_register(true))
{
CHK_LOGMANAGER(lm);
int attempts = 0;
int successes = 0;
for (int i = LOGFILE_FIRST; i <= LOGFILE_LAST; i <<= 1)
{
/**
* If a particular log is enabled in general and it is enabled for
* the current session, log the stuff.
*/
if (LOG_IS_ENABLED(i) && ((i & id) != 0))
{
++attempts;
if (logmanager_write_log((logfile_id_t)i,
flush,
prefix_len,
len, str) == 0)
{
++successes;
}
}
}
rv = logmanager_write_log(id, flush, prefix_len, len, str);
logmanager_unregister();
// Only if logging was attempted and nothing succeeded, it is considered a failure.
if ((attempts != 0) && (successes == 0))
{
rv = -1;
}
}
else
{
rv = -1;
}
return rv;
@ -1433,37 +1402,75 @@ const char PREFIX_NOTICE[] = "[Notice]: ";
const char PREFIX_INFO[] = "[Info] : ";
const char PREFIX_DEBUG[] = "[Debug] : ";
static log_prefix_t logfile_to_prefix(logfile_id_t id)
/**
* Returns the most "severe" file id.
*
* @param ids A single id or a bitmask of ids.
* @return A single id
*/
static logfile_id_t logfile_ids_to_id(logfile_id_t ids)
{
log_prefix_t prefix;
// The id can be a bitmask, hence we choose the most "severe" one.
if (id & LOGFILE_ERROR)
if (ids & LOGFILE_ERROR)
{
prefix.text = PREFIX_ERROR;
prefix.len = sizeof(PREFIX_ERROR);
return LOGFILE_ERROR;
}
else if (id & LOGFILE_MESSAGE)
else if (ids & LOGFILE_MESSAGE)
{
prefix.text = PREFIX_NOTICE;
prefix.len = sizeof(PREFIX_NOTICE);
return LOGFILE_MESSAGE;
}
else if (id & LOGFILE_TRACE)
else if (ids & LOGFILE_TRACE)
{
prefix.text = PREFIX_INFO;
prefix.len = sizeof(PREFIX_INFO);
return LOGFILE_TRACE;
}
else if (id & LOGFILE_DEBUG)
else if (ids & LOGFILE_DEBUG)
{
prefix.text = PREFIX_DEBUG;
prefix.len = sizeof(PREFIX_DEBUG);
return LOGFILE_DEBUG;
}
else
{
assert(!true);
return LOGFILE_ERROR;
}
}
/**
* Returns the prefix to be used for a specific logfile id.
*
* @param id A logfile id (not a mask)
* @return The corresponding prefix.
*/
static log_prefix_t logfile_id_to_prefix(logfile_id_t id)
{
log_prefix_t prefix;
switch (id)
{
case LOGFILE_ERROR:
prefix.text = PREFIX_ERROR;
prefix.len = sizeof(PREFIX_ERROR);
break;
case LOGFILE_MESSAGE:
prefix.text = PREFIX_NOTICE;
prefix.len = sizeof(PREFIX_NOTICE);
break;
case LOGFILE_TRACE:
prefix.text = PREFIX_INFO;
prefix.len = sizeof(PREFIX_INFO);
break;
case LOGFILE_DEBUG:
prefix.text = PREFIX_DEBUG;
prefix.len = sizeof(PREFIX_DEBUG);
break;
default:
assert(!true);
prefix.text = PREFIX_ERROR;
prefix.len = sizeof(PREFIX_ERROR);
break;
}
--prefix.len; // Remove trailing NULL.
@ -1480,6 +1487,11 @@ int skygw_log_write_context(logfile_id_t id,
...)
{
int err = 0;
id = logfile_ids_to_id(id); // Pick the most severe one.
if (LOG_IS_ENABLED(id))
{
va_list valist;
/**
@ -1491,7 +1503,7 @@ int skygw_log_write_context(logfile_id_t id,
if (message_len >= 0)
{
log_prefix_t prefix = logfile_to_prefix(id);
log_prefix_t prefix = logfile_id_to_prefix(id);
static const char FORMAT_FUNCTION[] = "(%s): ";
@ -1555,6 +1567,7 @@ int skygw_log_write_context(logfile_id_t id,
fprintf(stderr, "skygw_log_write failed.\n");
}
}
}
return err;
}