diff options
| author | Roger Dingledine <arma@torproject.org> | 2008-10-13 03:34:29 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2008-10-13 03:34:29 +0000 |
| commit | d7cfa1f56c2838d4f5be88748e9c1c05d4411ef6 (patch) | |
| tree | 8b1aeeb0fcaba76173d8442279761e3bd464f200 /src/or/control.c | |
| parent | c9bddb24b2cad24e5af5245e112ed1216477baa7 (diff) | |
| download | tor-d7cfa1f56c2838d4f5be88748e9c1c05d4411ef6.tar.gz tor-d7cfa1f56c2838d4f5be88748e9c1c05d4411ef6.zip | |
Minor fix in the warning messages when you're having problems
bootstrapping; also, be more forgiving of bootstrap problems when
we're still making incremental progress on a given bootstrap phase.
svn:r17066
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c index c41ef37858..31468831a0 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3866,8 +3866,8 @@ control_event_bootstrap(bootstrap_status_t status, int progress) if (progress > bootstrap_percent) { /* incremental progress within a milestone */ bootstrap_percent = progress; + bootstrap_problems = 0; /* Progress! Reset our problem counter. */ } - bootstrap_problems = 0; /* Progress! Reset our problem counter. */ } } @@ -3901,6 +3901,7 @@ control_event_bootstrap_problem(const char *warn, int reason) while (status>=0 && bootstrap_status_to_string(status, &tag, &summary) < 0) status--; /* find a recognized status string based on current progress */ + status = bootstrap_percent; /* set status back to the actual number */ log_fn(!strcmp(recommendation, "warn") ? LOG_WARN : LOG_INFO, LD_CONTROL, "Problem bootstrapping. Stuck at %d%%: %s. (%s; %s; " |