tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-10-25 17:24:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add config validation stats.

Browse Source 
Fixes #5298
This commit is contained in:
Michael Friedrich 2013-12-13 15:24:24 +01:00
parent 47f814cc4d
commit c66878fa45
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/config/configitem.cpp
View File

@ -22,6 +22,7 @@
#include "base/application.h" #include "base/application.h"
#include "base/dynamictype.h" #include "base/dynamictype.h"
#include "base/objectlock.h" #include "base/objectlock.h"
#include "base/convert.h"
#include "base/logger_fwd.h" #include "base/logger_fwd.h"
#include "base/debug.h" #include "base/debug.h"
#include "base/workqueue.h" #include "base/workqueue.h"
@ -186,7 +187,7 @@ DynamicObject::Ptr ConfigItem::Commit(void)
dobj->Register(); dobj->Register();
m_Object = dobj; m_Object = dobj;
return dobj; return dobj;
} }
@ -270,11 +271,11 @@ bool ConfigItem::ActivateItems(bool validateOnly)
Log(LogInformation, "config", "Validating config items (step 1)..."); Log(LogInformation, "config", "Validating config items (step 1)...");
ParallelWorkQueue upq; ParallelWorkQueue upq;
BOOST_FOREACH(const ItemMap::value_type& kv, m_Items) { BOOST_FOREACH(const ItemMap::value_type& kv, m_Items) {
upq.Enqueue(boost::bind(&ConfigItem::ValidateItem, kv.second)); upq.Enqueue(boost::bind(&ConfigItem::ValidateItem, kv.second));
} }
upq.Join(); upq.Join();
if (ConfigCompilerContext::GetInstance()->HasErrors()) if (ConfigCompilerContext::GetInstance()->HasErrors())
@ -285,9 +286,9 @@ bool ConfigItem::ActivateItems(bool validateOnly)
BOOST_FOREACH(const ItemMap::value_type& kv, m_Items) { BOOST_FOREACH(const ItemMap::value_type& kv, m_Items) {
upq.Enqueue(boost::bind(&ConfigItem::Commit, kv.second)); upq.Enqueue(boost::bind(&ConfigItem::Commit, kv.second));
} }
upq.Join(); upq.Join();
std::vector<DynamicObject::Ptr> objects; std::vector<DynamicObject::Ptr> objects;
BOOST_FOREACH(const ItemMap::value_type& kv, m_Items) { BOOST_FOREACH(const ItemMap::value_type& kv, m_Items) {
DynamicObject::Ptr object = kv.second->m_Object; DynamicObject::Ptr object = kv.second->m_Object;
@ -295,13 +296,13 @@ bool ConfigItem::ActivateItems(bool validateOnly)
if (object) if (object)
objects.push_back(object); objects.push_back(object);
} }
Log(LogInformation, "config", "Triggering OnConfigLoaded signal for config items"); Log(LogInformation, "config", "Triggering OnConfigLoaded signal for config items");
BOOST_FOREACH(const DynamicObject::Ptr& object, objects) { BOOST_FOREACH(const DynamicObject::Ptr& object, objects) {
upq.Enqueue(boost::bind(&DynamicObject::OnConfigLoaded, object)); upq.Enqueue(boost::bind(&DynamicObject::OnConfigLoaded, object));
} }
upq.Join(); upq.Join();
Log(LogInformation, "config", "Validating config items (step 2)..."); Log(LogInformation, "config", "Validating config items (step 2)...");
@ -311,7 +312,12 @@ bool ConfigItem::ActivateItems(bool validateOnly)
} }
upq.Join(); upq.Join();
/* log stats for external parsers */
BOOST_FOREACH(const DynamicType::Ptr& type, DynamicType::GetTypes()) {
Log(LogInformation, "config", "Checked " + Convert::ToString(type->GetObjects().size()) + " " + type->GetName() + "(s).");
}
if (ConfigCompilerContext::GetInstance()->HasErrors()) if (ConfigCompilerContext::GetInstance()->HasErrors())
return false; return false;
@ -322,7 +328,7 @@ bool ConfigItem::ActivateItems(bool validateOnly)
DynamicObject::RestoreObjects(Application::GetStatePath()); DynamicObject::RestoreObjects(Application::GetStatePath());
Log(LogInformation, "config", "Triggering Start signal for config items"); Log(LogInformation, "config", "Triggering Start signal for config items");
BOOST_FOREACH(const DynamicType::Ptr& type, DynamicType::GetTypes()) { BOOST_FOREACH(const DynamicType::Ptr& type, DynamicType::GetTypes()) {
BOOST_FOREACH(const DynamicObject::Ptr& object, type->GetObjects()) { BOOST_FOREACH(const DynamicObject::Ptr& object, type->GetObjects()) {
if (object->IsActive()) if (object->IsActive())
@ -334,9 +340,9 @@ bool ConfigItem::ActivateItems(bool validateOnly)
upq.Enqueue(boost::bind(&DynamicObject::Start, object)); upq.Enqueue(boost::bind(&DynamicObject::Start, object));
} }
} }
upq.Join(); upq.Join();
#ifdef _DEBUG #ifdef _DEBUG
BOOST_FOREACH(const DynamicType::Ptr& type, DynamicType::GetTypes()) { BOOST_FOREACH(const DynamicType::Ptr& type, DynamicType::GetTypes()) {
BOOST_FOREACH(const DynamicObject::Ptr& object, type->GetObjects()) { BOOST_FOREACH(const DynamicObject::Ptr& object, type->GetObjects()) {