Merge remote-tracking branch 'public/bug10485'

This commit is contained in:
Nick Mathewson 2013-12-24 11:42:35 -05:00
commit 573ee36eae
4 changed files with 11 additions and 6 deletions

4
changes/bug10485 Normal file
View File

@ -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.

View File

@ -1373,11 +1373,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.

View File

@ -3018,7 +3018,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],

View File

@ -14,6 +14,7 @@
#include "router.h"
#include "circuitlist.h"
#include "main.h"
#include "rephist.h"
#include "hibernate.h"
#include "statefile.h"
@ -128,6 +129,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);