diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-09 13:05:27 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-09 13:05:27 -0400 |
| commit | fb0de57ba28d92421748cd3db54221c0813fdb0e (patch) | |
| tree | aaaa47759e02e5fde465182ec94f9a522adef67b | |
| parent | 42d877f0847f5541108328c52fb671740b888a18 (diff) | |
| parent | 98822df3dcdf7cd0456aee7898507dd3059f930b (diff) | |
| download | tor-fb0de57ba28d92421748cd3db54221c0813fdb0e.tar.gz tor-fb0de57ba28d92421748cd3db54221c0813fdb0e.zip | |
Merge remote-tracking branch 'public/feature15006_026' into maint-0.2.6
| -rw-r--r-- | changes/feature15006 | 4 | ||||
| -rw-r--r-- | src/or/control.c | 15 |
2 files changed, 15 insertions, 4 deletions
diff --git a/changes/feature15006 b/changes/feature15006 new file mode 100644 index 0000000000..168a440ba0 --- /dev/null +++ b/changes/feature15006 @@ -0,0 +1,4 @@ + o Minor features (controller): + - Messages about problems in the bootstrap process now include + information about the server we were trying to connect to when we + noticed the problem. Closes ticket 15006. diff --git a/src/or/control.c b/src/or/control.c index a2b986768a..e25c3b2954 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -5086,19 +5086,26 @@ MOCK_IMPL(void, log_fn(severity, LD_CONTROL, "Problem bootstrapping. Stuck at %d%%: %s. (%s; %s; " - "count %d; recommendation %s)", + "count %d; recommendation %s; host %s at %s:%d)", status, summary, warn, orconn_end_reason_to_control_string(reason), - bootstrap_problems, recommendation); + bootstrap_problems, recommendation, + hex_str(or_conn->identity_digest, DIGEST_LEN), + or_conn->base_.address, + or_conn->base_.port); connection_or_report_broken_states(severity, LD_HANDSHAKE); tor_snprintf(buf, sizeof(buf), "BOOTSTRAP PROGRESS=%d TAG=%s SUMMARY=\"%s\" WARNING=\"%s\" REASON=%s " - "COUNT=%d RECOMMENDATION=%s", + "COUNT=%d RECOMMENDATION=%s HOSTID=\"%s\" HOSTADDR=\"%s:%d\"", bootstrap_percent, tag, summary, warn, orconn_end_reason_to_control_string(reason), bootstrap_problems, - recommendation); + recommendation, + hex_str(or_conn->identity_digest, DIGEST_LEN), + or_conn->base_.address, + (int)or_conn->base_.port); + tor_snprintf(last_sent_bootstrap_message, sizeof(last_sent_bootstrap_message), "WARN %s", buf); |