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

Add code to suppress spurious libevent log msgs; use it to resolve bug 68.

Browse Source 
svn:r3948
This commit is contained in:
Nick Mathewson 2005-04-01 07:05:21 +00:00
parent bc668233ad
commit 410ecfcc71
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/log.c
View File

@ -482,8 +482,11 @@ void switch_logs_debug(void)
}
#ifdef HAVE_EVENT_SET_LOG_CALLBACK
static const char *suppress_msg = NULL;
void libevent_logging_callback(int severity, const char *msg)
{
if (suppress_msg && strstr(msg, suppress_msg))
return;
switch (severity) {
case _EVENT_LOG_DEBUG:
log(LOG_DEBUG, "Message from libevent: %s", msg);
@ -506,6 +509,10 @@ void configure_libevent_logging(void)
{
event_set_log_callback(libevent_logging_callback);
}
void suppress_libevent_log_msg(const char *msg)
{
suppress_msg = msg;
}
#else
void configure_libevent_logging(void) {}
#endif

1
src/common/log.h
View File

@ -67,6 +67,7 @@ void add_temp_log(void);
void close_temp_logs(void);
void mark_logs_temp(void);
void configure_libevent_logging(void);
void suppress_libevent_log_msg(const char *msg);
/* Outputs a message to stdout */
void _log(int severity, const char *format, ...) CHECK_PRINTF(2,3);

2
src/or/config.c
View File

@ -270,7 +270,9 @@ options_act(void) {
}
if (!libevent_initialized) {
configure_libevent_logging();
suppress_libevent_logmsg("function not implemented");
event_init();
suppress_libevent_msg(NULL);
#if defined(HAVE_EVENT_GET_VERSION) && defined(HAVE_EVENT_GET_METHOD)
/* Making this a NOTICE for now so we can link bugs to a libevent versions
* or methods better. */