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

Config sync does not set endpoint syncing and plays disconnect-sync ping-pong 

fixes #10255
This commit is contained in:
Michael Friedrich 2015-09-30 16:14:04 +02:00
parent 657e749c9b
commit 0529d51a85
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/remote/apilistener.cpp
View File

@ -375,11 +375,6 @@ void ApiListener::NewClientHandlerInternal(const Socket::Ptr& client, const Stri
if (endpoint) {
endpoint->AddClient(aclient);
/* sync zone file config */
SendConfigUpdate(aclient);
/* sync runtime config */
SendRuntimeConfigObjects(aclient);
if (need_sync) {
{
ObjectLock olock(endpoint);
@ -387,6 +382,17 @@ void ApiListener::NewClientHandlerInternal(const Socket::Ptr& client, const Stri
endpoint->SetSyncing(true);
}
Log(LogInformation, "ApiListener")
<< "Sending updates for endpoint '" << endpoint->GetName() << "'.";
/* sync zone file config */
SendConfigUpdate(aclient);
/* sync runtime config */
SendRuntimeConfigObjects(aclient);
Log(LogInformation, "ApiListener")
<< "Finished sending updates for endpoint '" << endpoint->GetName() << "'.";
ReplayLog(aclient);
}
} else