Commit 534acf40 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'bug10485_024' into maint-0.2.4

parents 35115496 edc6fa25

changes/bug10485

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfixes:

    - Move message about circuit handshake counts into the heartbeat

      message where it belongs, instead of logging it once per hour

      unconditionally. Fixes bug 10485; bugfix on 0.2.4.17-rc.

src/or/main.c

+0 −5
Original line number Diff line number Diff line
@@ -1353,11 +1353,6 @@ run_scheduled_events(time_t now) 
        next_time_to_write_stats_files = next_write;

    }

    time_to_write_stats_files = next_time_to_write_stats_files;



    /* Also commandeer this opportunity to log how our circuit handshake

     * stats have been doing. */

    if (public_server_mode(options))

      rep_hist_log_circuit_handshake_stats(now);

  }



  /* 1h. Check whether we should write bridge statistics to disk.

src/or/rephist.c

+0 −1
Original line number Diff line number Diff line
@@ -3041,7 +3041,6 @@ void 
rep_hist_log_circuit_handshake_stats(time_t now)

{

  (void)now;

  /* XXX024 maybe quiet this log message before 0.2.4 goes stable for real */

  log_notice(LD_HIST, "Circuit handshake stats since last time: "

             "%d/%d TAP, %d/%d NTor.",

             onion_handshakes_completed[ONION_HANDSHAKE_TYPE_TAP],

src/or/status.c

+3 −0
Original line number Diff line number Diff line
@@ -121,6 +121,9 @@ log_heartbeat(time_t now) 
    log_notice(LD_HEARTBEAT, "TLS write overhead: %.f%%", overhead);

  }



  if (public_server_mode(options))

    rep_hist_log_circuit_handshake_stats(now);



  tor_free(uptime);

  tor_free(bw_sent);

  tor_free(bw_rcvd);