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

Discard unnamed config items as early as possible

This commit is contained in:
Gunnar Beutner 2014-11-09 04:17:34 +01:00
parent a362b5c14c
commit 4bb535fc47
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/config/configitem.cpp
View File

@ -43,6 +43,7 @@ using namespace icinga;
boost::mutex ConfigItem::m_Mutex; boost::mutex ConfigItem::m_Mutex;
ConfigItem::ItemMap ConfigItem::m_Items; ConfigItem::ItemMap ConfigItem::m_Items;
ConfigItem::ItemList ConfigItem::m_UnnamedItems;
/** /**
* Constructor for the ConfigItem class. * Constructor for the ConfigItem class.
@ -229,30 +230,20 @@ DynamicObject::Ptr ConfigItem::Commit(bool discard)
*/ */
void ConfigItem::Register(void) void ConfigItem::Register(void)
{ {
String name = m_Name;
/* If this is a non-abstract object we need to figure out
* its real name now - or assign it a temporary name. */
if (!m_Abstract) {
shared_ptr<NameComposer> nc = dynamic_pointer_cast<NameComposer>(Type::GetByName(m_Type));
if (nc) {
name = nc->MakeName(m_Name, Dictionary::Ptr());
ASSERT(name.IsEmpty() || name == m_Name);
if (name.IsEmpty())
name = Utility::NewUniqueID();
}
}
std::pair<String, String> key = std::make_pair(m_Type, name);
ConfigItem::Ptr self = GetSelf(); ConfigItem::Ptr self = GetSelf();
/* If this is a non-abstract object with a composite name
* we register it in m_UnnamedItems instead of m_Items. */
if (!m_Abstract && dynamic_pointer_cast<NameComposer>(Type::GetByName(m_Type))) {
boost::mutex::scoped_lock lock(m_Mutex); boost::mutex::scoped_lock lock(m_Mutex);
m_UnnamedItems.push_back(self);
} else {
std::pair<String, String> key = std::make_pair(m_Type, m_Name);
boost::mutex::scoped_lock lock(m_Mutex);
m_Items[key] = self; m_Items[key] = self;
} }
}
/** /**
* Retrieves a configuration item by type and name. * Retrieves a configuration item by type and name.
@ -291,6 +282,10 @@ bool ConfigItem::ValidateItems(void)
upq.Enqueue(boost::bind(&ConfigItem::Commit, kv.second, false)); upq.Enqueue(boost::bind(&ConfigItem::Commit, kv.second, false));
} }
BOOST_FOREACH(const ConfigItem::Ptr& item, m_UnnamedItems) {
upq.Enqueue(boost::bind(&ConfigItem::Commit, item, true));
}
upq.Join(); upq.Join();
std::vector<DynamicObject::Ptr> objects; std::vector<DynamicObject::Ptr> objects;
@ -301,6 +296,15 @@ bool ConfigItem::ValidateItems(void)
objects.push_back(object); objects.push_back(object);
} }
BOOST_FOREACH(const ConfigItem::Ptr& item, m_UnnamedItems) {
DynamicObject::Ptr object = item->m_Object;
if (object)
objects.push_back(object);
}
m_UnnamedItems.clear();
Log(LogInformation, "ConfigItem", "Triggering OnConfigLoaded signal for config items"); Log(LogInformation, "ConfigItem", "Triggering OnConfigLoaded signal for config items");
BOOST_FOREACH(const DynamicObject::Ptr& object, objects) { BOOST_FOREACH(const DynamicObject::Ptr& object, objects) {

3
lib/config/configitem.hpp
View File

@ -84,6 +84,9 @@ private:
typedef std::map<std::pair<String, String>, ConfigItem::Ptr> ItemMap; typedef std::map<std::pair<String, String>, ConfigItem::Ptr> ItemMap;
static ItemMap m_Items; /**< All registered configuration items. */ static ItemMap m_Items; /**< All registered configuration items. */
typedef std::vector<ConfigItem::Ptr> ItemList;
static ItemList m_UnnamedItems;
static ConfigItem::Ptr GetObjectUnlocked(const String& type, static ConfigItem::Ptr GetObjectUnlocked(const String& type,
const String& name); const String& name);
}; };