diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-12-18 08:10:11 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-12-18 08:10:11 -0500 |
| commit | e64157a54f02eb422c87cfdab718eede08e9790a (patch) | |
| tree | 0a8370f46d2fa2e7bd235d34e19bd8580b707447 | |
| parent | 580c68ec1d15b53ae187d846804e08b99b4a514b (diff) | |
| parent | c61cd5775c137ef45f5449b9f996c05c63c21acf (diff) | |
| download | tor-e64157a54f02eb422c87cfdab718eede08e9790a.tar.gz tor-e64157a54f02eb422c87cfdab718eede08e9790a.zip | |
Merge branch 'maint-0.3.5' into release-0.3.5
| -rw-r--r-- | changes/ticket28731 | 4 | ||||
| -rw-r--r-- | src/feature/control/control.c | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/changes/ticket28731 b/changes/ticket28731 deleted file mode 100644 index f8b116cc12..0000000000 --- a/changes/ticket28731 +++ /dev/null @@ -1,4 +0,0 @@ - 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 8208b80c23..795902e6f4 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): %s", status, tag, summary); + "Bootstrapped %d%%: %s", status, 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; %s; " + LD_CONTROL, "Problem bootstrapping. Stuck at %d%%: %s. (%s; %s; " "count %d; recommendation %s; host %s at %s)", - status, tag, summary, warn, reason, + status, summary, warn, reason, bootstrap_problems, recommendation, or_id, hostaddr); |