diff options
| author | Roger Dingledine <arma@torproject.org> | 2008-06-24 08:00:30 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2008-06-24 08:00:30 +0000 |
| commit | aec928e0b6dec87b33e3f75e5ddcfc503eb4949b (patch) | |
| tree | bf668a40586b12be7523e71ab49cabd1d2fbd57f /src | |
| parent | 470f89119a355d9ed7836fb2c448a66c5241eeb1 (diff) | |
| download | tor-aec928e0b6dec87b33e3f75e5ddcfc503eb4949b.tar.gz tor-aec928e0b6dec87b33e3f75e5ddcfc503eb4949b.zip | |
Send a bootstrap problem "warn" event on the first problem if the
reason is NO_ROUTE (that is, our network is down).
svn:r15443
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/control.c | 7 | ||||
| -rw-r--r-- | src/or/directory.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/or/control.c b/src/or/control.c index db7540bf0f..06902bcd87 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3828,8 +3828,8 @@ control_event_bootstrap(bootstrap_status_t status, int progress) if (status > bootstrap_percent || (progress && progress > bootstrap_percent)) { bootstrap_status_to_string(status, &tag, &summary); - log_notice(LD_CONTROL, "Bootstrapped %d%%: %s.", - progress ? progress : status, summary); + log(status ? LOG_NOTICE : LOG_INFO, LD_CONTROL, + "Bootstrapped %d%%: %s.", progress ? progress : status, summary); tor_snprintf(buf, sizeof(buf), "BOOTSTRAP PROGRESS=%d TAG=%s SUMMARY=\"%s\"", progress ? progress : status, tag, summary); @@ -3868,6 +3868,9 @@ control_event_bootstrap_problem(const char *warn, int reason) if (bootstrap_problems >= BOOTSTRAP_PROBLEM_THRESHOLD) recommendation = "warn"; + if (reason == END_OR_CONN_REASON_NO_ROUTE) + recommendation = "warn"; + if (get_options()->UseBridges && !any_bridge_descriptors_known() && !any_pending_bridge_descriptor_fetches()) diff --git a/src/or/directory.c b/src/or/directory.c index 70d3ca91b1..febdced840 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -588,7 +588,7 @@ connection_dir_download_routerdesc_failed(dir_connection_t *conn) * it's not their fault. */ /* No need to relaunch descriptor downloads here: we already do it - * every 10 seconds (DESCRIPTOR_RETRY_INTERVAL) in main.c. */ + * every 10 or 60 seconds (FOO_DESCRIPTOR_RETRY_INTERVAL) in main.c. */ tor_assert(conn->_base.purpose == DIR_PURPOSE_FETCH_SERVERDESC || conn->_base.purpose == DIR_PURPOSE_FETCH_EXTRAINFO); |