nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove extraneous newlines from libevent log messages. Backport candidate?

Browse Source 
svn:r4350
This commit is contained in:
Nick Mathewson 2005-06-08 17:41:32 +00:00
parent 4c43789435
commit 8b2a7ff9fe
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/log.c
View File

@ -499,23 +499,29 @@ static const char *suppress_msg = NULL;
static void
libevent_logging_callback(int severity, const char *msg)
{
char buf[1024];
size_t n;
if (suppress_msg && strstr(msg, suppress_msg))
return;
n = strlcpy(buf, msg, sizeof(buf));
if (n && n < sizeof(buf) && buf[n-1] == '\n') {
buf[n-1] = '\0';
}
switch (severity) {
case _EVENT_LOG_DEBUG:
log(LOG_DEBUG, "Message from libevent: %s", msg);
log(LOG_DEBUG, "Message from libevent: %s", buf);
break;
case _EVENT_LOG_MSG:
log(LOG_INFO, "Message from libevent: %s", msg);
log(LOG_INFO, "Message from libevent: %s", buf);
break;
case _EVENT_LOG_WARN:
log(LOG_WARN, "Warning from libevent: %s", msg);
log(LOG_WARN, "Warning from libevent: %s", buf);
break;
case _EVENT_LOG_ERR:
log(LOG_ERR, "Error from libevent: %s", msg);
log(LOG_ERR, "Error from libevent: %s", buf);
break;
default:
log(LOG_WARN, "Message [%d] from libevent: %s", severity, msg);
log(LOG_WARN, "Message [%d] from libevent: %s", severity, buf);
break;
}
}