Another bugfix for the event order.

diff --git a/lib/base/dynamicobject.cpp b/lib/base/dynamicobject.cpp
index 683d0fde5983c2ed1106b2c06a3a11153a30b4f8..ba8828788b5cc87fc2436fb6610c6575067f765f 100644 (file)
--- a/lib/base/dynamicobject.cpp
+++ b/lib/base/dynamicobject.cpp
@@ -292,6 +292,7 @@ void DynamicObject::RestoreObjects(const String& filename, int attributeTypes)
                        ASSERT(!object->IsActive());
                        Log(LogDebug, "base", "Restoring object '" + name + "' of type '" + type + "'.");
                        object->Deserialize(update, attributeTypes);
+                       object->OnStateLoaded();
                }
 
                restored++;

diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index 94b7e4015fb33c9cdf5f3f2a57736630df90f0fd..cfba85cc74ed9f41435eeaf672f10a51997346cb 100644 (file)
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -282,15 +282,16 @@ void ConfigItem::ActivateItems(void)
        /* restore the previous program state */
        DynamicObject::RestoreObjects(Application::GetStatePath());
 
-       BOOST_FOREACH(const DynamicObject::Ptr& object, objects) {
-               object->OnStateLoaded();
-       }
+       BOOST_FOREACH(const DynamicType::Ptr& type, DynamicType::GetTypes()) {
+               BOOST_FOREACH(const DynamicObject::Ptr& object, type->GetObjects()) {
+                       if (object->IsActive())
+                               continue;
 
-       BOOST_FOREACH(const DynamicObject::Ptr& object, objects) {
-               Log(LogDebug, "config", "Activating object '" + object->GetName() + "' of type '" + object->GetType()->GetName() + "'");
-               object->Start();
+                       Log(LogDebug, "config", "Activating object '" + object->GetName() + "' of type '" + object->GetType()->GetName() + "'");
+                       object->Start();
 
-               ASSERT(object->IsActive());
+                       ASSERT(object->IsActive());
+               }
        }
 }
 

diff --git a/lib/icinga/host.cpp b/lib/icinga/host.cpp
index b886504e77dc73047bc2808c215d18c91744f5b6..5cbc2f021f4686980ee9bda52c4b784d65d14f75 100644 (file)
--- a/lib/icinga/host.cpp
+++ b/lib/icinga/host.cpp
@@ -246,7 +246,7 @@ void Host::UpdateSlaveServices(void)
 
                ConfigItem::Ptr serviceItem = builder->Compile();
                DynamicObject::Ptr dobj = serviceItem->Commit();
-               dobj->Start();
+               dobj->OnConfigLoaded();
        }
 }
 

diff --git a/lib/icinga/service-notification.cpp b/lib/icinga/service-notification.cpp
index d7c520f8ed59461ff69e80060527a64b51644185..f4b7685f3469737d7fe276eb04f649164da80871 100644 (file)
--- a/lib/icinga/service-notification.cpp
+++ b/lib/icinga/service-notification.cpp
@@ -194,7 +194,7 @@ void Service::UpdateSlaveNotifications(void)
 
                        ConfigItem::Ptr notificationItem = builder->Compile();
                        DynamicObject::Ptr dobj = notificationItem->Commit();
-                       dobj->Start();
+                       dobj->OnConfigLoaded();
                }
        }
 }