diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-12-13 18:57:00 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-12-13 18:57:00 -0500 |
| commit | 94a79981580d6260597f799bc1a163c8e6f07acd (patch) | |
| tree | ee83fcf155a5dd660177d80c13a909514aa7c09e | |
| parent | a3fe08164758e755fb2b51c7fb96e42d96179640 (diff) | |
| parent | 1b855af5e33189d70d74273af03a535c343b63a5 (diff) | |
| download | tor-94a79981580d6260597f799bc1a163c8e6f07acd.tar.gz tor-94a79981580d6260597f799bc1a163c8e6f07acd.zip | |
Merge remote-tracking branch 'tlyu-github/ticket28731-035' into maint-0.3.5
| -rw-r--r-- | changes/ticket28731 | 4 | ||||
| -rw-r--r-- | src/feature/control/control.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/changes/ticket28731 b/changes/ticket28731 new file mode 100644 index 0000000000..f8b116cc12 --- /dev/null +++ b/changes/ticket28731 @@ -0,0 +1,4 @@ + o Minor features (bootstrap): + - Add the bootstrap tag name to the log messages, so people + troubleshooting connection problems can look up a symbol instead + of a number. Closes ticket 28731. diff --git a/src/feature/control/control.c b/src/feature/control/control.c index 795902e6f4..8208b80c23 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -7153,7 +7153,7 @@ control_event_bootstrap_core(int loglevel, bootstrap_status_t status, status = progress; tor_log(loglevel, LD_CONTROL, - "Bootstrapped %d%%: %s", status, summary); + "Bootstrapped %d%% (%s): %s", status, tag, summary); tor_snprintf(buf, sizeof(buf), "BOOTSTRAP PROGRESS=%d TAG=%s SUMMARY=\"%s\"", status, tag, summary); @@ -7309,9 +7309,9 @@ control_event_bootstrap_problem(const char *warn, const char *reason, hostaddr = tor_strdup("?"); log_fn(severity, - LD_CONTROL, "Problem bootstrapping. Stuck at %d%%: %s. (%s; %s; " + LD_CONTROL, "Problem bootstrapping. Stuck at %d%% (%s): %s. (%s; %s; " "count %d; recommendation %s; host %s at %s)", - status, summary, warn, reason, + status, tag, summary, warn, reason, bootstrap_problems, recommendation, or_id, hostaddr); |