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

Copy service and host dependencies into service items.

This commit is contained in:
Gunnar Beutner 2013-02-08 21:38:34 +01:00
parent e443b77a56
commit f725c6ee7a
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/icinga/host.cpp
View File

@ -178,7 +178,7 @@ bool Host::IsUp(void) const
return (!service || service->GetState() == StateOK || service->GetState() == StateWarning); return (!service || service->GetState() == StateOK || service->GetState() == StateWarning);
} }
template<typename TDict> template<bool copyServiceAttrs, typename TDict>
static void CopyServiceAttributes(TDict serviceDesc, const ConfigItemBuilder::Ptr& builder) static void CopyServiceAttributes(TDict serviceDesc, const ConfigItemBuilder::Ptr& builder)
{ {
/* TODO: we only need to copy macros if this is an inline definition, /* TODO: we only need to copy macros if this is an inline definition,
@ -203,6 +203,16 @@ static void CopyServiceAttributes(TDict serviceDesc, const ConfigItemBuilder::Pt
Value checkers = serviceDesc->Get("checkers"); Value checkers = serviceDesc->Get("checkers");
if (!checkers.IsEmpty()) if (!checkers.IsEmpty())
builder->AddExpression("checkers", OperatorSet, checkers); builder->AddExpression("checkers", OperatorSet, checkers);
if (copyServiceAttrs) {
Value servicedependencies = serviceDesc->Get("servicedependencies");
if (!servicedependencies.IsEmpty())
builder->AddExpression("servicedependencies", OperatorPlus, servicedependencies);
Value hostdependencies = serviceDesc->Get("hostdependencies");
if (!hostdependencies.IsEmpty())
builder->AddExpression("hostdependencies", OperatorPlus, hostdependencies);
}
} }
void Host::UpdateSlaveServices(void) void Host::UpdateSlaveServices(void)
@ -236,7 +246,7 @@ void Host::UpdateSlaveServices(void)
builder->AddExpression("alias", OperatorSet, svcname); builder->AddExpression("alias", OperatorSet, svcname);
builder->AddExpression("short_name", OperatorSet, svcname); builder->AddExpression("short_name", OperatorSet, svcname);
CopyServiceAttributes(this, builder); CopyServiceAttributes<false>(this, builder);
if (svcdesc.IsScalar()) { if (svcdesc.IsScalar()) {
builder->AddParent(svcdesc); builder->AddParent(svcdesc);
@ -249,7 +259,7 @@ void Host::UpdateSlaveServices(void)
builder->AddParent(parent); builder->AddParent(parent);
CopyServiceAttributes(service, builder); CopyServiceAttributes<true>(service, builder);
} else { } else {
BOOST_THROW_EXCEPTION(invalid_argument("Service description must be either a string or a dictionary.")); BOOST_THROW_EXCEPTION(invalid_argument("Service description must be either a string or a dictionary."));
} }