Tweak/cleanup 5526 fix.

diff --git a/changes/ticket5526 b/changes/ticket5526
index 35c982b63735891c49d9282ae2601595d8f32983..35911d4b0c86f1c1dfcc56adc7d28a3af4244c30 100644 (file)
--- a/changes/ticket5526
+++ b/changes/ticket5526
@@ -1,4 +1,4 @@
   o Minor features:
     - Log current accounting state (bytes sent and received + remaining
       time for the current accounting period) in the server's
-      heartbeat message. 
+      heartbeat message. Implements ticket 5526; patch from Peter Retzlaff.

diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index 712a6959a6eab7fb3f9e0bbdb45585824516e155..607dec8cd57093d4e5499614dea7c008461848c0 100644 (file)
--- a/src/or/hibernate.c
+++ b/src/or/hibernate.c
@@ -255,6 +255,7 @@ accounting_get_interval_length(void)
   return (int)(interval_end_time - interval_start_time);
 }
 
+/** Return the time at which the current accounting interval will end. */
 time_t
 accounting_get_end_time(void)
 {

diff --git a/src/or/status.c b/src/or/status.c
index 2fda471947c575aaae74c7802fd9ee1b104ab333..6e2206e5e59a9ec6aa766e4f1bb9aa65923f0f3c 100644 (file)
--- a/src/or/status.c
+++ b/src/or/status.c
@@ -17,6 +17,8 @@
 #include "hibernate.h"
 #include "statefile.h"
 
+static void log_accounting(const time_t now, const or_options_t *options);
+
 /** Return the total number of circuits. */
 static int
 count_circuits(void)
@@ -133,7 +135,7 @@ log_heartbeat(time_t now)
   return 0;
 }
 
-void
+static void
 log_accounting(const time_t now, const or_options_t *options)
 {
   or_state_t *state = get_or_state();
@@ -146,9 +148,9 @@ log_accounting(const time_t now, const or_options_t *options)
   format_local_iso_time(end_buf, interval_end);
   remaining = secs_to_uptime(interval_end - now);
 
-  log_notice(LD_HEARTBEAT, "Heartbeat: "
+  log_notice(LD_HEARTBEAT, "Heartbeat: Accounting enabled. "
       "Sent: %s / %s, Received: %s / %s. The "
-      "current accounting period ends on %s. That's %s left to go.",
+      "current accounting interval ends on %s, in %s.",
       acc_sent, acc_max, acc_rcvd, acc_max, end_buf, remaining);
 
   tor_free(acc_rcvd);
@@ -156,3 +158,4 @@ log_accounting(const time_t now, const or_options_t *options)
   tor_free(acc_max);
   tor_free(remaining);
 }
+

diff --git a/src/or/status.h b/src/or/status.h
index 4a334b156da804c649a6b0d09d7afd2e5a0f69b5..7c3b969c8687d6a2c79fa8b0e08e88ecce847286 100644 (file)
--- a/src/or/status.h
+++ b/src/or/status.h
@@ -5,7 +5,6 @@
 #define TOR_STATUS_H
 
 int log_heartbeat(time_t now);
-void log_accounting(const time_t now, const or_options_t *options);
 
 #endif