]> granicus.if.org Git - icinga2/commitdiff
Bugfixes.
authorGunnar Beutner <gunnar.beutner@netways.de>
Wed, 27 Jun 2012 22:07:58 +0000 (00:07 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Wed, 27 Jun 2012 22:07:58 +0000 (00:07 +0200)
icinga/nagioschecktask.cpp

index 6cf767664fa7f0b277379db959560f5b7a29be23..ee1e2b43c625c56638eee64917b904ad3728f304 100644 (file)
@@ -101,10 +101,8 @@ void NagiosCheckTask::CheckThreadProc(void)
                while (!m_Tasks.empty() && tasks.size() < MaxChecksPerThread) {
                        NagiosCheckTask::Ptr task = m_Tasks.front();
                        m_Tasks.pop_front();
-                       time_t now;
-                       time(&now);
-                       task->GetResult().SetScheduleStart(now);
                        if (!task->InitTask()) {
+                               time_t now;
                                time(&now);
                                task->GetResult().SetScheduleEnd(now);
 
@@ -120,6 +118,10 @@ void NagiosCheckTask::CheckThreadProc(void)
 
 bool NagiosCheckTask::InitTask(void)
 {
+       time_t now;
+       time(&now);
+       GetResult().SetExecutionStart(now);
+
 #ifdef _MSC_VER
        m_FP = _popen(m_Command.c_str(), "r");
 #else /* _MSC_VER */