diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-12-13 19:01:29 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-12-13 19:01:29 -0500 |
| commit | f8dac5c900856494867996f60da848b0111aad35 (patch) | |
| tree | 471a5afdbd0a27fcb18f04640ad92c3cf29ef74c | |
| parent | 69264f96f3561c72d14c1e518ca84ad18557d905 (diff) | |
| parent | 94a79981580d6260597f799bc1a163c8e6f07acd (diff) | |
| download | tor-f8dac5c900856494867996f60da848b0111aad35.tar.gz tor-f8dac5c900856494867996f60da848b0111aad35.zip | |
Merge branch 'maint-0.3.5'
| -rw-r--r-- | changes/ticket28731 | 4 | ||||
| -rw-r--r-- | src/feature/control/control_bootstrap.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_bootstrap.c b/src/feature/control/control_bootstrap.c index 7299757f91..0756e208e0 100644 --- a/src/feature/control/control_bootstrap.c +++ b/src/feature/control/control_bootstrap.c @@ -126,7 +126,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); @@ -282,9 +282,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); |