tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-09-23 17:57:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Handle partial config::Update

Browse Source 
refs #8210
This commit is contained in:
Alexander A. Klimov 2020-09-09 11:04:51 +02:00
parent ebcc64cbed
commit 3449e73e9f
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -972,6 +972,34 @@ void ApiListener::HandleConfigUpdate(const MessageOrigin::Ptr& origin, const Dic
if (checksums) if (checksums)
newConfigInfo.Checksums = checksums->Get(kv.first); newConfigInfo.Checksums = checksums->Get(kv.first);
for (auto& dict : { newConfigInfo.UpdateV1, newConfigInfo.UpdateV2 }) {
ObjectLock oLock (dict);
for (auto& kv : dict) {
if (kv.second.GetType() == ValueEmpty) { // Partial update. New since v2.13.
auto file (productionConfigZoneDir + kv.first);
Log(LogDebug, "ApiListener")
<< "Loading local file due to partial config update from endpoint '"
<< fromEndpointName << "' for zone '" << zoneName << "': '" << file << "'";
std::ifstream fp (file.CStr(), std::ifstream::binary);
if (!fp) {
Log(LogWarning, "ApiListener")
<< "No such local file in config update from endpoint '" << fromEndpointName
<< "' for zone '" << zoneName << "': '" << file << "'";
continue;
}
// Should be kept in sync with ConfigGlobHandler().
dict->Set(kv.first, Utility::ValidateUTF8(String(
std::istreambuf_iterator<char>(fp), std::istreambuf_iterator<char>()
)));
}
}
}
// Load the current production config details. // Load the current production config details.
ConfigDirInformation productionConfigInfo = LoadConfigDir(productionConfigZoneDir); ConfigDirInformation productionConfigInfo = LoadConfigDir(productionConfigZoneDir);