diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-05-16 10:36:30 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-05-16 10:36:30 -0400 |
| commit | 891cf72f7103bc5b4de26ac974c0fd42a9d3c88f (patch) | |
| tree | 899597a45d6fd1efaffe95af990d293571b6d90a /src/or/main.c | |
| parent | d9ceab5bc3611fa6ed4e2f58d38ff26860eeeb3c (diff) | |
| parent | b41dd8069f25ef6f6fdb22088291e23e0442476e (diff) | |
| download | tor-891cf72f7103bc5b4de26ac974c0fd42a9d3c88f.tar.gz tor-891cf72f7103bc5b4de26ac974c0fd42a9d3c88f.zip | |
Merge branch 'bug5095_squashed'
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c index 9022f2eb87..8308b3a238 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1773,8 +1773,16 @@ do_hup(void) } options = get_options(); /* they have changed now */ } else { + char *msg = NULL; log_notice(LD_GENERAL, "Not reloading config file: the controller told " "us not to."); + /* Make stuff get rescanned, reloaded, etc. */ + if (set_options((or_options_t*)options, &msg) < 0) { + if (!msg) + msg = tor_strdup("Unknown error"); + log_warn(LD_GENERAL, "Unable to re-set previous options: %s", msg); + tor_free(msg); + } } if (authdir_mode_handles_descs(options, -1)) { /* reload the approved-routers file */ |