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

Checkable: Drop unused failedDependency argument from IsReachable()

Browse Source
This commit is contained in:
Yonas Habteab 2024-12-12 18:31:05 +01:00
parent 67664ad7b7
commit 93d9fad565
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/icinga/checkable-dependency.cpp
View File

@ -51,7 +51,7 @@ std::vector<Dependency::Ptr> Checkable::GetReverseDependencies() const
return std::vector<Dependency::Ptr>(m_ReverseDependencies.begin(), m_ReverseDependencies.end()); 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) { if (rstack > l_MaxDependencyRecursionLevel) {
Log(LogWarning, "Checkable") Log(LogWarning, "Checkable")
@ -61,7 +61,7 @@ bool Checkable::IsReachable(DependencyType dt, Dependency::Ptr *failedDependency
} }
for (const Checkable::Ptr& checkable : GetParents()) { for (const Checkable::Ptr& checkable : GetParents()) {
if (!checkable->IsReachable(dt, failedDependency, rstack + 1)) if (!checkable->IsReachable(dt, rstack + 1))
return false; return false;
} }
@ -71,9 +71,6 @@ bool Checkable::IsReachable(DependencyType dt, Dependency::Ptr *failedDependency
Host::Ptr host = service->GetHost(); Host::Ptr host = service->GetHost();
if (host && host->GetState() != HostUp && host->GetStateType() == StateTypeHard) { if (host && host->GetState() != HostUp && host->GetStateType() == StateTypeHard) {
if (failedDependency)
*failedDependency = nullptr;
return false; return false;
} }
} }
@ -90,9 +87,6 @@ bool Checkable::IsReachable(DependencyType dt, Dependency::Ptr *failedDependency
Log(LogDebug, "Checkable") Log(LogDebug, "Checkable")
<< "Non-redundant dependency '" << dep->GetName() << "' failed for checkable '" << GetName() << "': Marking as unreachable."; << "Non-redundant dependency '" << dep->GetName() << "' failed for checkable '" << GetName() << "': Marking as unreachable.";
if (failedDependency)
*failedDependency = dep;
return false; return false;
} }
@ -110,15 +104,9 @@ bool Checkable::IsReachable(DependencyType dt, Dependency::Ptr *failedDependency
Log(LogDebug, "Checkable") Log(LogDebug, "Checkable")
<< "All dependencies in redundancy group '" << violator->first << "' have failed for checkable '" << GetName() << "': Marking as unreachable."; << "All dependencies in redundancy group '" << violator->first << "' have failed for checkable '" << GetName() << "': Marking as unreachable.";
if (failedDependency)
*failedDependency = violator->second;
return false; return false;
} }
if (failedDependency)
*failedDependency = nullptr;
return true; return true;
} }

2
lib/icinga/checkable.hpp
View File

@ -81,7 +81,7 @@ public:
void AddGroup(const String& name); 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; bool AffectsChildren() const;
AcknowledgementType GetAcknowledgement(); AcknowledgementType GetAcknowledgement();