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

Added an ellipsis at the end of a log message that exceeds the maximum size.

Browse Source
This commit is contained in:
Markus Makela
2015-10-26 12:12:55 +02:00
parent 6c6f81abce
commit f2c5df703b
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
log_manager/log_manager.cc
View File

@ -756,10 +756,12 @@ static int logmanager_write_log(logfile_id_t id,
} }
cmplen = sesid_str_len > 0 ? sesid_str_len - sizeof(char) : 0; cmplen = sesid_str_len > 0 ? sesid_str_len - sizeof(char) : 0;
bool overflow = false;
/** Find out how much can be safely written with current block size */ /** Find out how much can be safely written with current block size */
if (timestamp_len - sizeof(char) + cmplen + str_len > lf->lf_buf_size) if (timestamp_len - sizeof(char) + cmplen + str_len > lf->lf_buf_size)
{ {
safe_str_len = lf->lf_buf_size; safe_str_len = lf->lf_buf_size;
overflow = true;
} }
else else
{ {
@ -856,6 +858,11 @@ static int logmanager_write_log(logfile_id_t id,
str); str);
} }
/** Add an ellipsis to an overflowing message to signal truncation. */
if (overflow && safe_str_len > 4)
{
memset(wp + safe_str_len - 4, '.', 3);
}
/** write to syslog */ /** write to syslog */
if (lf->lf_write_syslog) if (lf->lf_write_syslog)
{ {
@ -1609,7 +1616,7 @@ int skygw_log_write_context(logfile_id_t id,
if (len >= 0) if (len >= 0)
{ {
if(len > MAX_LOGSTRLEN) if (len > MAX_LOGSTRLEN)
{ {
len = MAX_LOGSTRLEN; len = MAX_LOGSTRLEN;
} }