Browse Source

Explain bug2346 fix better based on suggestions from arma

Nick Mathewson 13 years ago
parent
commit
5044cb9752
2 changed files with 5 additions and 3 deletions
  1. 3 2
      changes/bug2346
  2. 2 1
      src/or/config.c

+ 3 - 2
changes/bug2346

@@ -1,5 +1,6 @@
   o Minor features
-    - If writing the state file to disk fails, wait an hour before
-      retrying again.  Fixes bug 2346.  Bugfix on Tor 0.1.1.3-alpha.
+    - If writing the state file to disk fails, wait up to an hour
+      before retrying again.  (Our old code would retry the write
+      immediately.)  Fixes bug 2346.  Bugfix on Tor 0.1.1.3-alpha.
 
 

+ 2 - 1
src/or/config.c

@@ -5187,7 +5187,8 @@ or_state_save(time_t now)
     global_state->LastWritten = -1;
     tor_free(fname);
     tor_free(contents);
-    /* Try again in after STATE_WRITE_RETRY_INTERVAL */
+    /* Try again after STATE_WRITE_RETRY_INTERVAL (or sooner, if the state
+     * changes sooner). */
     global_state->next_write = now + STATE_WRITE_RETRY_INTERVAL;
     return -1;
   }