mirror of
https://github.com/Icinga/icinga2.git
synced 2025-07-23 13:45:04 +02:00
Checkable: Drop unused failedDependency
argument from IsReachable()
This commit is contained in:
parent
67664ad7b7
commit
93d9fad565
@ -51,7 +51,7 @@ std::vector<Dependency::Ptr> Checkable::GetReverseDependencies() const
|
||||
return std::vector<Dependency::Ptr>(m_ReverseDependencies.begin(), m_ReverseDependencies.end());
|
||||
}
|
||||
|
||||
bool Checkable::IsReachable(DependencyType dt, Dependency::Ptr *failedDependency, int rstack) const
|
||||
bool Checkable::IsReachable(DependencyType dt, int rstack) const
|
||||
{
|
||||
if (rstack > l_MaxDependencyRecursionLevel) {
|
||||
Log(LogWarning, "Checkable")
|
||||
@ -61,7 +61,7 @@ bool Checkable::IsReachable(DependencyType dt, Dependency::Ptr *failedDependency
|
||||
}
|
||||
|
||||
for (const Checkable::Ptr& checkable : GetParents()) {
|
||||
if (!checkable->IsReachable(dt, failedDependency, rstack + 1))
|
||||
if (!checkable->IsReachable(dt, rstack + 1))
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -71,9 +71,6 @@ bool Checkable::IsReachable(DependencyType dt, Dependency::Ptr *failedDependency
|
||||
Host::Ptr host = service->GetHost();
|
||||
|
||||
if (host && host->GetState() != HostUp && host->GetStateType() == StateTypeHard) {
|
||||
if (failedDependency)
|
||||
*failedDependency = nullptr;
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@ -90,9 +87,6 @@ bool Checkable::IsReachable(DependencyType dt, Dependency::Ptr *failedDependency
|
||||
Log(LogDebug, "Checkable")
|
||||
<< "Non-redundant dependency '" << dep->GetName() << "' failed for checkable '" << GetName() << "': Marking as unreachable.";
|
||||
|
||||
if (failedDependency)
|
||||
*failedDependency = dep;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -110,15 +104,9 @@ bool Checkable::IsReachable(DependencyType dt, Dependency::Ptr *failedDependency
|
||||
Log(LogDebug, "Checkable")
|
||||
<< "All dependencies in redundancy group '" << violator->first << "' have failed for checkable '" << GetName() << "': Marking as unreachable.";
|
||||
|
||||
if (failedDependency)
|
||||
*failedDependency = violator->second;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
if (failedDependency)
|
||||
*failedDependency = nullptr;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -81,7 +81,7 @@ public:
|
||||
|
||||
void AddGroup(const String& name);
|
||||
|
||||
bool IsReachable(DependencyType dt = DependencyState, intrusive_ptr<Dependency> *failedDependency = nullptr, int rstack = 0) const;
|
||||
bool IsReachable(DependencyType dt = DependencyState, int rstack = 0) const;
|
||||
bool AffectsChildren() const;
|
||||
|
||||
AcknowledgementType GetAcknowledgement();
|
||||
|
Loading…
x
Reference in New Issue
Block a user