diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-12-21 15:48:14 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-12-21 15:48:14 -0500 |
| commit | cdbd6d0fe88ed305bff33388439297474b27f352 (patch) | |
| tree | e01b7c688e08d709d40b2dfcb59454812704cf62 /src/common/compat_libevent.c | |
| parent | 029ca804b2bed051185cc21477a713f670106cae (diff) | |
| parent | cc051f9aca96b55533953cfcc10c86f9fe1e7b9a (diff) | |
| download | tor-cdbd6d0fe88ed305bff33388439297474b27f352.tar.gz tor-cdbd6d0fe88ed305bff33388439297474b27f352.zip | |
Merge remote branch 'rransom/bug2190_the_hard_way' into maint-0.2.2
Diffstat (limited to 'src/common/compat_libevent.c')
| -rw-r--r-- | src/common/compat_libevent.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 250fa2bdb7..96843c73e4 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; } |