From 30af9494d88ba8db94b2bcfc831a619c5e15d7ca Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Mon, 18 Jun 2012 01:58:13 +0200 Subject: [PATCH] Bugfixes. --- base/timer.cpp | 2 ++ components/checker/checkercomponent.cpp | 7 +------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/base/timer.cpp b/base/timer.cpp index d4382b9b8..58e9da42c 100644 --- a/base/timer.cpp +++ b/base/timer.cpp @@ -131,6 +131,8 @@ void Timer::Start(void) Stop(); Timers.push_back(GetSelf()); + + Reschedule(time(NULL) + m_Interval); } /** diff --git a/components/checker/checkercomponent.cpp b/components/checker/checkercomponent.cpp index e76989be2..e82792a6d 100644 --- a/components/checker/checkercomponent.cpp +++ b/components/checker/checkercomponent.cpp @@ -122,12 +122,7 @@ void CheckerComponent::AdjustCheckTimer(void) /* adjust next call time for the check timer */ Service service = m_Services.top(); - if (service.HasPendingCheck()) { - m_CheckTimer->Stop(); - } else { - m_CheckTimer->SetInterval(service.GetNextCheck() - time(NULL)); - m_CheckTimer->Start(); - } + m_CheckTimer->Reschedule(service.GetNextCheck()); } void CheckerComponent::AssignServiceRequestHandler(const Endpoint::Ptr& sender, const RequestMessage& request) -- 2.50.1