tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve variable names in ApiListener::SendConfigUpdate()

This commit is contained in:
Michael Friedrich 2018-10-25 14:30:34 +02:00
parent a4b48fc7f4
commit 6105ace50f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,11 +164,11 @@ void ApiListener::SendConfigUpdate(const JsonRpcConnection::Ptr& aclient)
Endpoint::Ptr endpoint = aclient->GetEndpoint(); Endpoint::Ptr endpoint = aclient->GetEndpoint();
ASSERT(endpoint); ASSERT(endpoint);
Zone::Ptr azone = endpoint->GetZone(); Zone::Ptr clientZone = endpoint->GetZone();
Zone::Ptr lzone = Zone::GetLocalZone(); Zone::Ptr localZone = Zone::GetLocalZone();
/* don't try to send config updates to our master */ /* don't try to send config updates to our master */
if (!azone->IsChildOf(lzone)) if (!clientZone->IsChildOf(localZone))
return; return;
Dictionary::Ptr configUpdateV1 = new Dictionary(); Dictionary::Ptr configUpdateV1 = new Dictionary();
@ -181,9 +181,11 @@ void ApiListener::SendConfigUpdate(const JsonRpcConnection::Ptr& aclient)
String zoneName = zone->GetName(); String zoneName = zone->GetName();
String zoneDir = zonesDir + zoneName; String zoneDir = zonesDir + zoneName;
if (!zone->IsChildOf(azone) && !zone->IsGlobal()) /* Only sync child and global zones. */
if (!zone->IsChildOf(clientZone) && !zone->IsGlobal())
continue; continue;
/* Zone was configured, but there's no configuration directory. */
if (!Utility::PathExists(zoneDir)) if (!Utility::PathExists(zoneDir))
continue; continue;