]> granicus.if.org Git - icinga2/commitdiff
Bugfixes.
authorGunnar Beutner <gunnar@beutner.name>
Sun, 17 Jun 2012 23:58:13 +0000 (01:58 +0200)
committerGunnar Beutner <gunnar@beutner.name>
Sun, 17 Jun 2012 23:58:13 +0000 (01:58 +0200)
base/timer.cpp
components/checker/checkercomponent.cpp

index d4382b9b8e39eb442f20a5f5cc130fc074202611..58e9da42c88820ec75b050badcf3c75690cca328 100644 (file)
@@ -131,6 +131,8 @@ void Timer::Start(void)
        Stop();
 
        Timers.push_back(GetSelf());
+
+       Reschedule(time(NULL) + m_Interval);
 }
 
 /**
index e76989be29006c2ed10a35e0299411404d5d4f0b..e82792a6def7110898306a8e6d97317d78b106d1 100644 (file)
@@ -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)