tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't save properties for non-persistent config objects.

This commit is contained in:
Gunnar Beutner 2012-07-24 14:18:33 +02:00
parent 5a80d47ca0
commit 928804b5f3
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
base/configobject.cpp
View File

@ -21,19 +21,18 @@
using namespace icinga;
map<pair<string, string>, ConfigObject::Ptr> ConfigObject::m_RetainedObjects;
map<pair<string, string>, Dictionary::Ptr> ConfigObject::m_PersistentTags;
ConfigObject::ConfigObject(Dictionary::Ptr properties, const ConfigObject::Set::Ptr& container)
: m_Container(container ? container : GetAllObjects()),
m_Properties(properties), m_Tags(boost::make_shared<Dictionary>())
{
/* restore the object's tags */
map<pair<string, string>, ConfigObject::Ptr>::iterator it;
it = m_RetainedObjects.find(make_pair(GetType(), GetName()));
if (it != m_RetainedObjects.end()) {
ConfigObject::Ptr retainedObject = it->second;
m_Tags = retainedObject->GetTags();
m_RetainedObjects.erase(it);
map<pair<string, string>, Dictionary::Ptr>::iterator it;
it = m_PersistentTags.find(make_pair(GetType(), GetName()));
if (it != m_PersistentTags.end()) {
m_Tags = it->second;
m_PersistentTags.erase(it);
}
}
@ -247,7 +246,14 @@ void ConfigObject::DumpObjects(const string& filename)
BOOST_FOREACH(const ConfigObject::Ptr object, ConfigObject::GetAllObjects()) {
Dictionary::Ptr persistentObject = boost::make_shared<Dictionary>();
persistentObject->Set("properties", object->GetProperties());
persistentObject->Set("type", object->GetType());
persistentObject->Set("name", object->GetName());
/* only persist properties for replicated objects or for objects
* that are marked as persistent */
if (!object->GetSource().empty() /*|| object->IsPersistent()*/)
persistentObject->Set("properties", object->GetProperties());
persistentObject->Set("tags", object->GetTags());
Variant value = persistentObject;
@ -296,24 +302,27 @@ void ConfigObject::RestoreObjects(const string& filename)
Dictionary::Ptr persistentObject = value;
Dictionary::Ptr properties;
if (!persistentObject->Get("properties", &properties))
string type;
if (!persistentObject->Get("type", &type))
continue;
string name;
if (!persistentObject->Get("name", &name))
continue;
Dictionary::Ptr tags;
if (!persistentObject->Get("tags", &tags))
continue;
ConfigObject::Ptr object = boost::make_shared<ConfigObject>(properties);
object->SetTags(tags);
if (!object->GetSource().empty()) {
/* restore replicated objects right away */
Dictionary::Ptr properties;
if (persistentObject->Get("properties", &properties)) {
ConfigObject::Ptr object = boost::make_shared<ConfigObject>(properties);
object->SetTags(tags);
object->Commit();
} else {
/* keep non-replicated objects until another config object with
* the same name is created (which is when we restore its tags) */
m_RetainedObjects[make_pair(object->GetType(), object->GetName())] = object;
m_PersistentTags[make_pair(type, name)] = tags;
}
}
}

2
base/configobject.h
View File

@ -102,7 +102,7 @@ private:
Dictionary::Ptr m_Properties;
Dictionary::Ptr m_Tags;
static map<pair<string, string>, ConfigObject::Ptr> m_RetainedObjects;
static map<pair<string, string>, Dictionary::Ptr> m_PersistentTags;
void SetCommitTimestamp(time_t ts);