aboutsummaryrefslogtreecommitdiff
path: root/src/common/compat_libevent.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-12-21 15:50:09 -0500
committerNick Mathewson <nickm@torproject.org>2010-12-21 15:50:09 -0500
commit0a3b7f1471b608a83edfdf3cdca391aca6f73eb1 (patch)
tree5dc61438a7cddd689020f9862bfac137f81f9a99 /src/common/compat_libevent.c
parent601b6a8099e6df9b933e9c8290eeef86bc86c84c (diff)
parentcdbd6d0fe88ed305bff33388439297474b27f352 (diff)
downloadtor-0a3b7f1471b608a83edfdf3cdca391aca6f73eb1.tar
tor-0a3b7f1471b608a83edfdf3cdca391aca6f73eb1.tar.gz
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/common/compat_libevent.c')
-rw-r--r--src/common/compat_libevent.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c
index 7bbad5441..4e50cfade 100644
--- a/src/common/compat_libevent.c
+++ b/src/common/compat_libevent.c
@@ -65,19 +65,19 @@ libevent_logging_callback(int severity, const char *msg)
}
switch (severity) {
case _EVENT_LOG_DEBUG:
- log(LOG_DEBUG, LD_NET, "Message from libevent: %s", buf);
+ log(LOG_DEBUG, LD_NOCB|LD_NET, "Message from libevent: %s", buf);
break;
case _EVENT_LOG_MSG:
- log(LOG_INFO, LD_NET, "Message from libevent: %s", buf);
+ log(LOG_INFO, LD_NOCB|LD_NET, "Message from libevent: %s", buf);
break;
case _EVENT_LOG_WARN:
- log(LOG_WARN, LD_GENERAL, "Warning from libevent: %s", buf);
+ log(LOG_WARN, LD_NOCB|LD_GENERAL, "Warning from libevent: %s", buf);
break;
case _EVENT_LOG_ERR:
- log(LOG_ERR, LD_GENERAL, "Error from libevent: %s", buf);
+ log(LOG_ERR, LD_NOCB|LD_GENERAL, "Error from libevent: %s", buf);
break;
default:
- log(LOG_WARN, LD_GENERAL, "Message [%d] from libevent: %s",
+ log(LOG_WARN, LD_NOCB|LD_GENERAL, "Message [%d] from libevent: %s",
severity, buf);
break;
}