diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-12 12:37:51 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-12 12:37:51 -0500 |
| commit | 597433bcec3cc8270dec810fe82d8accc85931ef (patch) | |
| tree | 646560d6470819448f6f505ef675ebb8b2f4c0b7 | |
| parent | aa45e8259368c9733e459dc4f91f62492b9926da (diff) | |
| parent | 5044cb9752b4414cadcdc3b12926b005e390fdf0 (diff) | |
| download | tor-597433bcec3cc8270dec810fe82d8accc85931ef.tar.gz tor-597433bcec3cc8270dec810fe82d8accc85931ef.zip | |
Merge branch 'bug2346' into maint-0.2.2
| -rw-r--r-- | changes/bug2346 | 6 | ||||
| -rw-r--r-- | src/or/config.c | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/changes/bug2346 b/changes/bug2346 new file mode 100644 index 0000000000..0f78b84614 --- /dev/null +++ b/changes/bug2346 @@ -0,0 +1,6 @@ + o Minor features + - 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. + + diff --git a/src/or/config.c b/src/or/config.c index 17d776e71e..a27fd22b24 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5145,6 +5145,9 @@ or_state_load(void) return r; } +/** If writing the state to disk fails, try again after this many seconds. */ +#define STATE_WRITE_RETRY_INTERVAL 3600 + /** Write the persistent state to disk. Return 0 for success, <0 on failure. */ int or_state_save(time_t now) @@ -5179,10 +5182,14 @@ or_state_save(time_t now) tor_free(state); fname = get_datadir_fname("state"); if (write_str_to_file(fname, contents, 0)<0) { - log_warn(LD_FS, "Unable to write state to file \"%s\"", fname); + log_warn(LD_FS, "Unable to write state to file \"%s\"; will try later", + fname); global_state->LastWritten = -1; tor_free(fname); tor_free(contents); + /* 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; } |