aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-05-03 12:23:55 -0400
committerNick Mathewson <nickm@torproject.org>2018-05-09 14:01:00 -0400
commitc9f07f36bf986f274ac9fc56b5c61bbcc669b22e (patch)
tree99e1f3f000920b8be97e38a66c5795b1ab650370 /src/or/main.c
parent285e7c98fdca8eda97683c0b96f86645ee3f0546 (diff)
downloadtor-c9f07f36bf986f274ac9fc56b5c61bbcc669b22e.tar.gz
tor-c9f07f36bf986f274ac9fc56b5c61bbcc669b22e.zip
Mark the 1-per-sec update_current_time() call as redundant.
We still do this time update here, since we do it from all callbacks, but it is no longer a reason to keep the once-per-second callback enabled. Closes ticket 26009.
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c
index e82162c399..b6035fa765 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2576,8 +2576,12 @@ second_elapsed_callback(periodic_timer_t *timer, void *arg)
n_libevent_errors = 0;
- /* log_notice(LD_GENERAL, "Tick."); */
now = time(NULL);
+
+ /* We don't need to do this once-per-second any more: time-updating is
+ * only in this callback _because it is a callback_. It should be fine
+ * to disable this callback, and the time will still get updated.
+ */
update_current_time(now);
/* the second has rolled over. check more stuff. */