Fix example time period.

diff --git a/lib/base/script.cpp b/lib/base/script.cpp
index 405c660a44e5dc3826bd678a2384a937baa4a9f5..17fdffe92c8b1c46f4495d771d501f9d68162b76 100644 (file)
--- a/lib/base/script.cpp
+++ b/lib/base/script.cpp
@@ -22,6 +22,7 @@
 #include "base/dynamictype.h"
 #include "base/logger_fwd.h"
 #include "base/objectlock.h"
+#include "base/utility.h"
 
 using namespace icinga;
 
@@ -44,7 +45,7 @@ Script::Script(const Dictionary::Ptr& serializedUpdate)
  */
 void Script::Start(void)
 {
-       assert(OwnsLock());
+       ASSERT(OwnsLock());
 
        SpawnInterpreter();
 }
@@ -74,7 +75,7 @@ String Script::GetCode(void) const
  */
 void Script::OnAttributeUpdate(const String& name)
 {
-       assert(!OwnsLock());
+       ASSERT(!OwnsLock());
 
        if (name == "language" || name == "code")
                SpawnInterpreter();

diff --git a/lib/icinga/perfdatawriter.cpp b/lib/icinga/perfdatawriter.cpp
index 3e866b4f32706601556bef923300c564167e7d2e..c6131ef7ccc77eef52db6eb77b703438bf562a26 100644 (file)
--- a/lib/icinga/perfdatawriter.cpp
+++ b/lib/icinga/perfdatawriter.cpp
@@ -49,7 +49,7 @@ PerfdataWriter::~PerfdataWriter(void)
  */
 void PerfdataWriter::OnAttributeChanged(const String& name)
 {
-       assert(!OwnsLock());
+       ASSERT(!OwnsLock());
 
        if (name == "rotation_interval") {
                m_RotationTimer->SetInterval(GetRotationInterval());

diff --git a/lib/icinga/timeperiod.cpp b/lib/icinga/timeperiod.cpp
index 14b518de13cf8d3bbd17d2d67caa945b3cde8415..821d59a45219f091bb3033b7dd467ab8adae08f4 100644 (file)
--- a/lib/icinga/timeperiod.cpp
+++ b/lib/icinga/timeperiod.cpp
@@ -329,7 +329,7 @@ void TimePeriod::EvenMinutesTimePeriodUpdate(const ScriptTask::Ptr& task, const
                if ((t % 2) == 0) {
                        Dictionary::Ptr segment = boost::make_shared<Dictionary>();
                        segment->Set("begin", t * 60);
-                       segment->Set("end", t * 61);
+                       segment->Set("end", (t + 1) * 60);
 
                        segments->Add(segment);
                }