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

Removed obsolete code.

This commit is contained in:
Gunnar Beutner 2012-07-03 15:26:58 +02:00
parent d3b4cc7b0d
commit efff45cf0b
2 changed files with 15 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
cib/service.cpp
View File

@ -107,102 +107,27 @@ Dictionary::Ptr Service::GetCheckers(void) const
return value; return value;
} }
vector<Service> Service::GetParents(void) const
{
vector<Service> parents;
Dictionary::Ptr dependencies = GetDependencies();
if (dependencies) {
Dictionary::Iterator it;
for (it = dependencies->Begin(); it != dependencies->End(); it++)
parents.push_back(Service::GetByName(it->second));
}
return parents;
}
vector<Service> Service::GetChildren(void) const
{
vector<Service> children;
UpdateDependencyCache();
Dictionary::Ptr childrenCache;
GetConfigObject()->GetTag("dependency_children", &childrenCache);
if (childrenCache) {
Dictionary::Iterator it;
for (it = childrenCache->Begin(); it != childrenCache->End(); it++)
children.push_back(Service::GetByName(it->second));
}
return children;
}
void Service::UpdateDependencyCache(void)
{
static long cacheTx = 0;
if (m_DependencyCacheValid)
return;
cacheTx++;
ConfigObject::TMap::Range range = ConfigObject::GetObjects("service");
ConfigObject::TMap::Iterator it;
for (it = range.first; it != range.second; it++) {
Service child = it->second;
vector<Service> parents = child.GetParents();
vector<Service>::iterator st;
for (st = parents.begin(); st != parents.end(); st++) {
Service parent = *st;
long tx = 0;
parent.GetConfigObject()->GetTag("dependency_cache_tx", &tx);
Dictionary::Ptr children;
/* rather than resetting the dependency dictionary in a separate loop we use the cache_tx
* tag to check if the dictionary is from this cache update run. */
if (tx != cacheTx) {
children = boost::make_shared<Dictionary>();
parent.GetConfigObject()->SetTag("dependency_children", children);
parent.GetConfigObject()->SetTag("dependency_cache_tx", cacheTx);
} else {
parent.GetConfigObject()->GetTag("dependency_children", &children);
assert(children);
}
children->AddUnnamedProperty(child.GetName());
}
}
m_DependencyCacheValid = true;
}
void Service::InvalidateDependencyCache(void)
{
m_DependencyCacheValid = false;
}
bool Service::IsReachable(void) const bool Service::IsReachable(void) const
{ {
vector<Service> parents = GetParents(); Dictionary::Ptr dependencies = GetDependencies();
if (dependencies) {
Dictionary::Iterator it;
for (it = dependencies->Begin(); it != dependencies->End(); it++) {
Service service = Service::GetByName(it->second);
vector<Service>::iterator it;
for (it = parents.begin(); it != parents.end(); it++) {
/* ignore ourselves */ /* ignore ourselves */
if (it->GetName() == GetName()) if (service.GetName() == GetName())
continue; continue;
if (!it->IsReachable()) if (!service.IsReachable())
return false; return false;
if (it->GetStateType() == StateTypeHard && it->GetState() != StateOK && if (service.GetStateType() == StateTypeHard && service.GetState() != StateOK &&
it->GetState() != StateWarning) service.GetState() != StateWarning)
return false; return false;
} }
}
return true; return true;
} }

5
cib/service.h
View File

@ -44,11 +44,6 @@ public:
Dictionary::Ptr GetGroups(void) const; Dictionary::Ptr GetGroups(void) const;
Dictionary::Ptr GetCheckers(void) const; Dictionary::Ptr GetCheckers(void) const;
vector<Service> GetParents(void) const;
vector<Service> GetChildren(void) const;
static void UpdateDependencyCache(void);
static void InvalidateDependencyCache(void);
bool IsReachable(void) const; bool IsReachable(void) const;
void SetNextCheck(time_t nextCheck); void SetNextCheck(time_t nextCheck);