diff options
| author | Roger Dingledine <arma@torproject.org> | 2008-08-04 23:38:32 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2008-08-04 23:38:32 +0000 |
| commit | 2a417700b441bc3d13a0d0476179788061addadf (patch) | |
| tree | 2052a81056c935b50c6887f49d74d9a239bd1ffd | |
| parent | 1fe07f66f470e39fa9138402be4f2c32b1faca60 (diff) | |
| download | tor-2a417700b441bc3d13a0d0476179788061addadf.tar.gz tor-2a417700b441bc3d13a0d0476179788061addadf.zip | |
don't log-warn on a bootstrapping status event if the recommendation
is to ignore.
svn:r16405
| -rw-r--r-- | src/or/control.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/or/control.c b/src/or/control.c index aaf4701a15..31dd65c769 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3850,7 +3850,7 @@ control_event_bootstrap(bootstrap_status_t status, int progress) /* Called when Tor has failed to make bootstrapping progress in a way * that indicates a problem. <b>warn</b> gives a hint as to why, and - * <b>reason</b> provides an "or_conn_end_reason" tag). + * <b>reason</b> provides an "or_conn_end_reason" tag. */ void control_event_bootstrap_problem(const char *warn, int reason) @@ -3879,11 +3879,12 @@ 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 */ - log_warn(LD_CONTROL, "Problem bootstrapping. Stuck at %d%%: %s. (%s; %s; " - "count %d; recommendation %s)", - status, summary, warn, - orconn_end_reason_to_control_string(reason), - bootstrap_problems, recommendation); + log_fn(!strcmp(recommendation, "warn") ? LOG_WARN : LOG_INFO, + LD_CONTROL, "Problem bootstrapping. Stuck at %d%%: %s. (%s; %s; " + "count %d; recommendation %s)", + status, summary, warn, + orconn_end_reason_to_control_string(reason), + bootstrap_problems, recommendation); tor_snprintf(buf, sizeof(buf), "BOOTSTRAP PROGRESS=%d TAG=%s SUMMARY=\"%s\" WARNING=\"%s\" REASON=%s " "COUNT=%d RECOMMENDATION=%s", |