diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-09 13:08:20 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-09 13:08:20 -0400 |
| commit | ed7f2482e2de6f5d08dfcd605626ae8ee373cace (patch) | |
| tree | fd06d447122a9a2b1c5f6b6882d4eac8eb8f1960 /src | |
| parent | 0ec135b6965b4b02de7dd6f695293df6e179a4a8 (diff) | |
| parent | fb0de57ba28d92421748cd3db54221c0813fdb0e (diff) | |
| download | tor-ed7f2482e2de6f5d08dfcd605626ae8ee373cace.tar.gz tor-ed7f2482e2de6f5d08dfcd605626ae8ee373cace.zip | |
Merge remote-tracking branch 'origin/maint-0.2.6'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/control.c | 15 |
1 files changed, 11 insertions, 4 deletions
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); |