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

Fix validator for dependencies

Browse Source 
fixes #8596
This commit is contained in:
Gunnar Beutner 2015-03-09 08:04:18 +01:00
parent 22f3c5082d
commit e50d3e6e5a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/config/configitem.cpp
View File

@ -360,6 +360,9 @@ bool ConfigItem::CommitNewItems(WorkQueue& upq)
} }
upq.Join(); upq.Join();
if (upq.HasExceptions())
return false;
} }
} while (!items.empty()); } while (!items.empty());

4
lib/icinga/dependency.cpp
View File

@ -77,7 +77,7 @@ void Dependency::OnAllConfigLoaded(void)
} }
if (!m_Child) if (!m_Child)
BOOST_THROW_EXCEPTION(ScriptError("Dependency '" << GetName() << "' references a child host/service which doesn't exist.", GetDebugInfo())); BOOST_THROW_EXCEPTION(ScriptError("Dependency '" + GetName() + "' references a child host/service which doesn't exist.", GetDebugInfo()));
m_Child->AddDependency(this); m_Child->AddDependency(this);
@ -96,7 +96,7 @@ void Dependency::OnAllConfigLoaded(void)
} }
if (!m_Parent) if (!m_Parent)
BOOST_THROW_EXCEPTION(ScriptError("Dependency '" << GetName() << "' references a parent host/service which doesn't exist.", GetDebugInfo())); BOOST_THROW_EXCEPTION(ScriptError("Dependency '" + GetName() + "' references a parent host/service which doesn't exist.", GetDebugInfo()));
m_Parent->AddReverseDependency(this); m_Parent->AddReverseDependency(this);
} }