mark_logs_temp() before init'ing new ones.

we were seeing double, triple, etc each time we setconf'ed.

svn:r2738

diff --git a/src/or/config.c b/src/or/config.c
index 02756d0754a26fe326c91540cc3e33677fd6fc66..12437317ee61b155bc93ab1d1e26437d09eed09b 100644 (file)
--- 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 e549a89d3e80648fcc0d4993590bca0a24dcec3c..0f0da41eeaf4aecd2c93e36d253160b7a6eb8806 100644 (file)
--- 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) {