mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 10:12:15 +01:00
Code Issues Projects Releases Wiki Activity

Move onion-type stats message into heartbeat

Browse Source 
Fix for 10485. Fix on 0.2.4.17-alpha.
This commit is contained in:
Nick Mathewson 2013-12-24 11:41:48 -05:00
parent 3511549651
commit 2b8962bc64
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.

5
src/or/main.c
View File

@ -1353,11 +1353,6 @@ run_scheduled_events(time_t now)
next_time_to_write_stats_files = next_write; next_time_to_write_stats_files = next_write;
} }
time_to_write_stats_files = next_time_to_write_stats_files; 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. /* 1h. Check whether we should write bridge statistics to disk.

2
src/or/rephist.c
View File

@ -3042,7 +3042,7 @@ rep_hist_log_circuit_handshake_stats(time_t now)
{ {
(void)now; (void)now;
/* XXX024 maybe quiet this log message before 0.2.4 goes stable for real */ /* 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.", "%d/%d TAP, %d/%d NTor.",
onion_handshakes_completed[ONION_HANDSHAKE_TYPE_TAP], onion_handshakes_completed[ONION_HANDSHAKE_TYPE_TAP],
onion_handshakes_requested[ONION_HANDSHAKE_TYPE_TAP], onion_handshakes_requested[ONION_HANDSHAKE_TYPE_TAP],

6
src/or/status.c
View File

@ -14,6 +14,7 @@
#include "router.h" #include "router.h"
#include "circuitlist.h" #include "circuitlist.h"
#include "main.h" #include "main.h"
#include "rephist.h"
#include "hibernate.h" #include "hibernate.h"
/** Return the total number of circuits. */ /** Return the total number of circuits. */
@ -121,6 +122,11 @@ log_heartbeat(time_t now)
log_notice(LD_HEARTBEAT, "TLS write overhead: %.f%%", overhead); 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(uptime);
tor_free(bw_sent); tor_free(bw_sent);
tor_free(bw_rcvd); tor_free(bw_rcvd);