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

Merge pull request #10417 from Icinga/inverted-hacluster-check

Browse Source 
Fix inverted `IsHACluster` check
This commit is contained in:
Julian Brost 2025-04-25 11:01:52 +02:00 committed by GitHub
commit a65f2d6b41
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/remote/apilistener.cpp
View File

@ -1927,11 +1927,7 @@ void ApiListener::ValidateTlsHandshakeTimeout(const Lazy<double>& lvalue, const
bool ApiListener::IsHACluster() bool ApiListener::IsHACluster()
{ {
Zone::Ptr zone = Zone::GetLocalZone(); Zone::Ptr zone = Zone::GetLocalZone();
return zone && zone->IsHACluster();
if (!zone)
return false;
return zone->IsSingleInstance();
} }
/* Provide a helper function for zone origin name. */ /* Provide a helper function for zone origin name. */

6
lib/remote/zone.cpp
View File

@ -125,10 +125,10 @@ bool Zone::IsGlobal() const
return GetGlobal(); return GetGlobal();
} }
bool Zone::IsSingleInstance() const bool Zone::IsHACluster() const
{ {
Array::Ptr endpoints = GetEndpointsRaw(); auto endpoints = GetEndpointsRaw();
return !endpoints || endpoints->GetLength() < 2; return endpoints && endpoints->GetLength() >= 2;
} }
Zone::Ptr Zone::GetLocalZone() Zone::Ptr Zone::GetLocalZone()

2
lib/remote/zone.hpp
View File

@ -29,7 +29,7 @@ public:
bool CanAccessObject(const ConfigObject::Ptr& object); bool CanAccessObject(const ConfigObject::Ptr& object);
bool IsChildOf(const Zone::Ptr& zone); bool IsChildOf(const Zone::Ptr& zone);
bool IsGlobal() const; bool IsGlobal() const;
bool IsSingleInstance() const; bool IsHACluster() const;
static Zone::Ptr GetLocalZone(); static Zone::Ptr GetLocalZone();