summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-11-19 22:52:32 -0500
committerNick Mathewson <nickm@torproject.org>2010-11-19 22:52:32 -0500
commitd166d18643197c57ba98d3a476df26c605554b26 (patch)
treec4b2ef69e1bf412a3bf59f397b22935a188f49ac /src/or
parent6199ac5fbec7f8a862440a8b65f7f299de4c2dbf (diff)
downloadtor-d166d18643197c57ba98d3a476df26c605554b26.tar.gz
tor-d166d18643197c57ba98d3a476df26c605554b26.zip
Better fix for 2190: defer libevent->controller messages instead of dropping
Diffstat (limited to 'src/or')
-rw-r--r--src/or/main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 9bdbbc17a6..e13215bd2e 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -893,6 +893,9 @@ run_scheduled_events(time_t now)
signewnym_impl(now);
}
+ /* 0c. If we've deferred log messages for the controller, handle them now */
+ flush_pending_log_callbacks();
+
/** 1a. Every MIN_ONION_KEY_LIFETIME seconds, rotate the onion keys,
* shut down and restart all cpuworkers, and update the directory if
* necessary.