Merge remote-tracking branch 'arma/feature6758'

This commit is contained in:
Nick Mathewson 2012-09-04 10:16:15 -04:00
commit 3da9a14f1c
2 changed files with 7 additions and 1 deletions

5
changes/feature6758 Normal file
View File

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

View File

@ -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;
}
}