aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-10-02 12:32:09 -0400
committerNick Mathewson <nickm@torproject.org>2015-01-14 11:23:34 -0500
commit1e896214e7eb5ede65663486291252b171e9daea (patch)
tree3f8d6aeb91e844888f16a2295e2200e22979a181 /src/or/main.c
parentcc6529e9bb7d7e01a25b5632d6d6c2424c6fc2b4 (diff)
downloadtor-1e896214e7eb5ede65663486291252b171e9daea.tar.gz
tor-1e896214e7eb5ede65663486291252b171e9daea.zip
Refactor cpuworker to use workqueue/threadpool code.
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/main.c b/src/or/main.c
index abf3230c4c..136043c117 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1271,7 +1271,7 @@ run_scheduled_events(time_t now)
get_onion_key_set_at()+MIN_ONION_KEY_LIFETIME < now) {
log_info(LD_GENERAL,"Rotating onion key.");
rotate_onion_key();
- cpuworkers_rotate();
+ cpuworkers_rotate_keyinfo();
if (router_rebuild_descriptor(1)<0) {
log_info(LD_CONFIG, "Couldn't rebuild router descriptor");
}
@@ -1960,9 +1960,9 @@ do_hup(void)
* force a retry there. */
if (server_mode(options)) {
- /* Restart cpuworker and dnsworker processes, so they get up-to-date
+ /* Update cpuworker and dnsworker processes, so they get up-to-date
* configuration options. */
- cpuworkers_rotate();
+ cpuworkers_rotate_keyinfo();
dns_reset();
}
return 0;