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

cluster: More delegation bugfixes.

Browse Source
This commit is contained in:
Gunnar Beutner 2013-09-12 15:38:01 +02:00
parent 7bc99d3860
commit 6698d09a72
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/cluster/clustercomponent.cpp
View File

@ -1133,7 +1133,7 @@ void ClusterComponent::CheckAuthorityHandler(const DynamicObject::Ptr& object, c
BOOST_FOREACH(const Endpoint::Ptr& endpoint, DynamicType::GetObjects<Endpoint>()) { BOOST_FOREACH(const Endpoint::Ptr& endpoint, DynamicType::GetObjects<Endpoint>()) {
bool match = false; bool match = false;
if (!endpoint->IsConnected() || !endpoint->HasFeature(type)) if ((!endpoint->IsConnected() && endpoint->GetName() != GetIdentity()) || !endpoint->HasFeature(type))
continue; continue;
if (authorities) { if (authorities) {
@ -1153,8 +1153,11 @@ void ClusterComponent::CheckAuthorityHandler(const DynamicObject::Ptr& object, c
endpoints.push_back(endpoint->GetName()); endpoints.push_back(endpoint->GetName());
} }
if (endpoints.empty()) if (endpoints.empty()) {
result = false;
return; return;
}
std::sort(endpoints.begin(), endpoints.end()); std::sort(endpoints.begin(), endpoints.end());