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

Merge pull request #7538 from Icinga/bugfix/dependency-ignore_on_error-7536 

Dependency#OnAllConfigLoaded(): don't link *this with the child if *this is going to be dropped
This commit is contained in:
Michael Friedrich 2019-09-25 12:12:22 +02:00 committed by GitHub
parent 4e23f954fa 7668314b4a
commit f0fcfdf910
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/icinga/dependency.cpp
View File

@ -75,8 +75,6 @@ void Dependency::OnAllConfigLoaded()
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);
Host::Ptr parentHost = Host::GetByName(GetParentHostName()); Host::Ptr parentHost = Host::GetByName(GetParentHostName());
if (parentHost) { if (parentHost) {
@ -89,6 +87,7 @@ void Dependency::OnAllConfigLoaded()
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_Child->AddDependency(this);
m_Parent->AddReverseDependency(this); m_Parent->AddReverseDependency(this);
} }