diff options
| author | Roger Dingledine <arma@torproject.org> | 2004-11-09 08:01:39 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2004-11-09 08:01:39 +0000 |
| commit | 6a504efdd3a9fcd6fe58b0195a74471c6a5a97c4 (patch) | |
| tree | b59a2654f32d4f16bb9bcecd9804d2c005f06a8a /src | |
| parent | 3901473bf303af00f47b2f02a1f5cbf2db5e070b (diff) | |
| download | tor-6a504efdd3a9fcd6fe58b0195a74471c6a5a97c4.tar.gz tor-6a504efdd3a9fcd6fe58b0195a74471c6a5a97c4.zip | |
mark_logs_temp() before init'ing new ones.
we were seeing double, triple, etc each time we setconf'ed.
svn:r2738
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/config.c | 4 | ||||
| -rw-r--r-- | src/or/main.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/or/config.c b/src/or/config.c index 02756d0754..12437317ee 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -256,8 +256,8 @@ options_act(void) { if (set_max_file_descriptors(options->MaxConn) < 0) return -1; - /* Configure the log(s) */ - if (config_init_logs(options)<0) + mark_logs_temp(); /* Close current logs once new logs are open. */ + if (config_init_logs(options)<0) /* Configure the log(s) */ return -1; /* Close the temporary log we used while starting up, if it isn't already * gone. */ diff --git a/src/or/main.c b/src/or/main.c index e549a89d3e..0f0da41eea 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -696,7 +696,6 @@ static int do_hup(void) { log_fn(LOG_NOTICE,"Received sighup. Reloading config."); has_completed_circuit=0; - mark_logs_temp(); /* Close current logs once new logs are open. */ /* first, reload config variables, in case they've changed */ /* no need to provide argc/v, they've been cached inside init_from_config */ if (init_from_config(0, NULL) < 0) { |