summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-05-01 10:26:04 -0400
committerNick Mathewson <nickm@torproject.org>2018-05-01 10:26:04 -0400
commit0d8604c76306ea95e7918af67cf268d630aea941 (patch)
treeea23c55dd3f94d550758248bb031cc5e3869520c /src/or/config.c
parentb0224bf7282f2ec968a46e35a2a8dab1ddaf0667 (diff)
downloadtor-0d8604c76306ea95e7918af67cf268d630aea941.tar.gz
tor-0d8604c76306ea95e7918af67cf268d630aea941.zip
Give queued_events_flush_all() responsibility for flushing log cbs
This requires that when a log cb happens, the event for flushing queued events is scheduled, so we also add the necessary machinery to have that happen. Note that this doesn't actually help with logs from outside the main thread, but those were already suppressed: see #25987 for a ticket tracking that issue.
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 54f3930fc5..208680060f 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1547,6 +1547,7 @@ options_act_reversible(const or_options_t *old_options, char **msg)
tor_malloc_zero(sizeof(log_severity_list_t));
close_temp_logs();
add_callback_log(severity, control_event_logmsg);
+ logs_set_pending_callback_callback(control_event_logmsg_pending);
control_adjust_event_log_severity();
tor_free(severity);
tor_log_update_sigsafe_err_fds();