Move onion-type stats message into heartbeat

Fix for 10485. Fix on 0.2.4.17-alpha.

diff --git a/changes/bug10485 b/changes/bug10485
new file mode 100644 (file)
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 deed798e803e60c5b47959f1a06ffcb6b684819f..bd23141b9748f248175f0112548e96f1b72b7ad2 100644 (file)
--- 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 131e531b1983d4dc65ece2dd4486e8be9964ca0f..20d963f87314cbed76f23d0883ff8527e0588fc9 100644 (file)
--- 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 d239e6ee75469c14c32f54ca631f711f088e692c..134d8ee88fde7052d63d7e25ad8ffeb2bc614bfb 100644 (file)
--- 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);