Browse Source

Merge remote-tracking branch 'arma/feature6758'

Nick Mathewson 11 years ago
parent
commit
3da9a14f1c
2 changed files with 7 additions and 1 deletions
  1. 5 0
      changes/feature6758
  2. 2 1
      src/or/main.c

+ 5 - 0
changes/feature6758

@@ -0,0 +1,5 @@
+  o Minor features:
+    - Omit the first heartbeat log message, because it never has anything
+      useful to say, and it clutters up the bootstrapping messages.
+      Resolves ticket 6758.
+

+ 2 - 1
src/or/main.c

@@ -1562,7 +1562,8 @@ run_scheduled_events(time_t now)
   /** 12. write the heartbeat message */
   if (options->HeartbeatPeriod &&
       time_to_next_heartbeat <= now) {
-    log_heartbeat(now);
+    if (time_to_next_heartbeat) /* don't log the first heartbeat */
+      log_heartbeat(now);
     time_to_next_heartbeat = now+options->HeartbeatPeriod;
   }
 }