commit f516c9ca99e4c3ef1bfeb3693e622befdd7954d2 Author: cypherpunks cypherpunks@torproject.org Date: Tue Jun 21 13:03:38 2016 +0000

Use the return value for choosing intervals --- src/or/main.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/or/main.c b/src/or/main.c index 5fa3869..4116740 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2071,14 +2071,19 @@ heartbeat_callback(time_t now, const or_options_t *options) return PERIODIC_EVENT_NO_UPDATE; }

- /* Write the heartbeat message */ + /* Skip the first one. */ if (first) { - first = 0; /* Skip the first one. */ - } else { - log_heartbeat(now); + first = 0; + return options->HeartbeatPeriod; }

- return options->HeartbeatPeriod; + /* Write the heartbeat message */ + int r = log_heartbeat(now); + if (r == 0) { + return options->HeartbeatPeriod; + } + + return PERIODIC_EVENT_NO_UPDATE; }

#define CDM_CLEAN_CALLBACK_INTERVAL 600