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 #5249 from Icinga/fix/cluster-log-crash 

Fix cluster crash w/ config sync

fixes #5212
This commit is contained in:
Michael Friedrich 2017-05-12 10:55:30 +02:00 committed by GitHub
parent 09a1d4f756 3753f53a67
commit 4ad1d1cd43
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/remote/apilistener-filesync.cpp
View File

@ -283,8 +283,8 @@ Value ApiListener::ConfigUpdateHandler(const MessageOrigin::Ptr& origin, const D
}
Log(LogInformation, "ApiListener")
<< "Applying config update from endpoint '" << origin->FromClient->GetEndpoint()->GetName() << "' of zone '"
<< origin->FromZone->GetName() << "'";
<< "Applying config update from endpoint '" << origin->FromClient->GetEndpoint()->GetName()
<< "' of zone '" << GetFromZoneName(origin->FromZone) << "'.";
Dictionary::Ptr updateV1 = params->Get("update");
Dictionary::Ptr updateV2 = params->Get("update_v2");

16
lib/remote/apilistener.cpp
View File

@ -1245,3 +1245,19 @@ bool ApiListener::IsHACluster(void)
return zone->IsSingleInstance();
}
/* Provide a helper function for zone origin name. */
String ApiListener::GetFromZoneName(const Zone::Ptr& fromZone)
{
String fromZoneName;
if (fromZone) {
fromZoneName = fromZone->GetName();
} else {
Zone::Ptr lzone = Zone::GetLocalZone();
if (lzone)
fromZoneName = lzone->GetName();
}
return fromZoneName;
}

1
lib/remote/apilistener.hpp
View File

@ -99,6 +99,7 @@ public:
static void UpdateObjectAuthority(void);
static bool IsHACluster(void);
static String GetFromZoneName(const Zone::Ptr& fromZone);
protected:
virtual void OnConfigLoaded(void) override;