From fcfa4a67332bba1bc526e284a2fe4adb87a3ec36 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Tue, 9 Nov 2004 08:01:39 +0000 Subject: [PATCH] mark_logs_temp() before init'ing new ones. we were seeing double, triple, etc each time we setconf'ed. svn:r2738 --- trunk/src/or/config.c | 4 ++-- trunk/src/or/main.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/trunk/src/or/config.c b/trunk/src/or/config.c index 02756d0754..12437317ee 100644 --- a/trunk/src/or/config.c +++ b/trunk/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/trunk/src/or/main.c b/trunk/src/or/main.c index e549a89d3e..0f0da41eea 100644 --- a/trunk/src/or/main.c +++ b/trunk/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) {