Skip to content
Snippets Groups Projects
Commit 3da9a14f authored by Nick Mathewson's avatar Nick Mathewson :game_die:
Browse files

Merge remote-tracking branch 'arma/feature6758'

parents 978a2251 e964f811
No related branches found
No related tags found
No related merge requests found
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.
......@@ -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;
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment