Fix: State file doesn't work for generated service objects.

lib/base/dynamicobject.cpp

@@ -68,11 +68,19 @@ Dictionary::Ptr DynamicObject::Serialize(int attributeTypes) const
 void DynamicObject::Deserialize(const Dictionary::Ptr& update, int attributeTypes)
 {
 	ASSERT(!OwnsLock());
-	ObjectLock olock(this);
 
+	{
+		ObjectLock olock(this);
 		InternalDeserialize(update, attributeTypes);
 	}
 
+	if (attributeTypes & Attribute_Config)
+		OnConfigLoaded();
+
+	if (attributeTypes & Attribute_State)
+		OnStateLoaded();
+}
+
 void DynamicObject::InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const
 {
 	if (attributeTypes & Attribute_Config) {
@@ -176,6 +184,16 @@ void DynamicObject::Stop(void)
 	OnStopped(GetSelf());
 }
 
+void DynamicObject::OnConfigLoaded(void)
+{
+	/* Nothing to do here. */
+}
+
+void DynamicObject::OnStateLoaded(void)
+{
+	/* Nothing to do here. */
+}
+
 Value DynamicObject::InvokeMethod(const String& method,
     const std::vector<Value>& arguments)
 {

lib/base/dynamicobject.h

@@ -102,6 +102,9 @@ protected:
 	virtual void InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const;
 	virtual void InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes);
 
+	virtual void OnConfigLoaded(void);
+	virtual void OnStateLoaded(void);
+
 private:
 	String m_Name;
 	String m_Type;

lib/icinga/host.cpp

@@ -56,7 +56,10 @@ void Host::Start(void)
 				hg->AddMember(GetSelf());
 		}
 	}
+}
 
+void Host::OnConfigLoaded(void)
+{
 	UpdateSlaveServices();
 }
 

lib/icinga/host.h

@@ -127,6 +127,8 @@ protected:
 	virtual void Start(void);
 	virtual void Stop(void);
 
+	virtual void OnConfigLoaded(void);
+
 	virtual void InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const;
 	virtual void InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes);
 

lib/icinga/service.cpp

@@ -44,6 +44,12 @@ void Service::Start(void)
 	SetSchedulingOffset(rand());
 	UpdateNextCheck();
 
+	AddDowntimesToCache();
+	AddCommentsToCache();
+}
+
+void Service::OnConfigLoaded(void)
+{
 	Array::Ptr groups = GetGroups();
 
 	if (groups) {
@@ -55,12 +61,11 @@ void Service::Start(void)
 		}
 	}
 
-	AddDowntimesToCache();
-	AddCommentsToCache();
-
 	Host::Ptr host = GetHost();
 	if (host)
 		host->AddService(GetSelf());
+
+	UpdateSlaveNotifications();
 }
 
 String Service::GetDisplayName(void) const

lib/icinga/service.h

@@ -332,6 +332,8 @@ public:
 protected:
 	virtual void Start(void);
 
+	virtual void OnConfigLoaded(void);
+
 	virtual void InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const;
 	virtual void InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes);
 

lib/icinga/user.cpp

@@ -27,10 +27,8 @@ using namespace icinga;
 
 REGISTER_TYPE(User);
 
-void User::Start(void)
+void User::OnConfigLoaded(void)
 {
-	DynamicObject::Start();
-
 	Array::Ptr groups = GetGroups();
 
 	if (groups) {

lib/icinga/user.h

@@ -57,9 +57,10 @@ public:
 	virtual bool ResolveMacro(const String& macro, const Dictionary::Ptr& cr, String *result) const;
 
 protected:
-	virtual void Start(void);
 	virtual void Stop(void);
 
+	virtual void OnConfigLoaded(void);
+
 	virtual void InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const;
 	virtual void InternalDeserialize(const Dictionary::Ptr& bag, int attributeTypes);