Commit f8dac5c9 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge branch 'maint-0.3.5'

parents 69264f96 94a79981

changes/ticket28731

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  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.

src/feature/control/control_bootstrap.c

+3 −3
Original line number Diff line number Diff line
@@ -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);