commit 2b8962bc64852d601efa2a8a624bffbbf5ba7ef5 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Dec 24 11:41:48 2013 -0500 Move onion-type stats message into heartbeat Fix for 10485. Fix on 0.2.4.17-alpha. --- changes/bug10485 | 4 ++++ src/or/main.c | 5 ----- src/or/rephist.c | 2 +- src/or/status.c | 6 ++++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/changes/bug10485 b/changes/bug10485 new file mode 100644 index 0000000..aa599fb --- /dev/null +++ b/changes/bug10485 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Turn "circuit handshake stats since last time" log messages into a + heartbeat message. Fixes bug 10485; bugfix on 0.2.4.17-rc. + diff --git a/src/or/main.c b/src/or/main.c index deed798..bd23141 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -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. diff --git a/src/or/rephist.c b/src/or/rephist.c index 131e531..20d963f 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -3042,7 +3042,7 @@ 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: " + log_notice(LD_HEARTBEAT, "Circuit handshake stats since last time: " "%d/%d TAP, %d/%d NTor.", onion_handshakes_completed[ONION_HANDSHAKE_TYPE_TAP], onion_handshakes_requested[ONION_HANDSHAKE_TYPE_TAP], diff --git a/src/or/status.c b/src/or/status.c index d239e6e..134d8ee 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -14,6 +14,7 @@ #include "router.h" #include "circuitlist.h" #include "main.h" +#include "rephist.h" #include "hibernate.h" /** Return the total number of circuits. */ @@ -121,6 +122,11 @@ log_heartbeat(time_t now) log_notice(LD_HEARTBEAT, "TLS write overhead: %.f%%", overhead); } + /* 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); + tor_free(uptime); tor_free(bw_sent); tor_free(bw_rcvd);