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

Use boost::filesystem & Utility classes for file IO

Browse Source
This commit is contained in:
Michael Friedrich 2019-05-13 11:27:49 +02:00
parent 6add9f9ecb
commit 0aa6f1a3b3
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,7 +83,7 @@ void ApiListener::SyncLocalZoneDir(const Zone::Ptr& zone) const
} }
} }
int sumUpdates = newConfigInfo.UpdateV1->GetLength() + newConfigInfo.UpdateV2->GetLength(); size_t sumUpdates = newConfigInfo.UpdateV1->GetLength() + newConfigInfo.UpdateV2->GetLength();
if (sumUpdates == 0) if (sumUpdates == 0)
return; return;
@ -140,16 +140,21 @@ void ApiListener::SyncLocalZoneDir(const Zone::Ptr& zone) const
if (!Utility::PathExists(authPath)) { if (!Utility::PathExists(authPath)) {
std::ofstream fp(authPath.CStr(), std::ofstream::out | std::ostream::trunc); std::ofstream fp(authPath.CStr(), std::ofstream::out | std::ostream::trunc);
fp.close();
} }
String checksumsPath = productionZonesDir + "/.checksums"; String checksumsPath = productionZonesDir + "/.checksums";
if (Utility::PathExists(checksumsPath)) if (Utility::PathExists(checksumsPath))
(void) unlink(checksumsPath.CStr()); Utility::Remove(checksumsPath);
std::ofstream fp(checksumsPath.CStr(), std::ofstream::out | std::ostream::trunc); std::ofstream fp(checksumsPath.CStr(), std::ofstream::out | std::ostream::trunc);
fp << std::fixed << JsonEncode(newConfigInfo.Checksums); fp << std::fixed << JsonEncode(newConfigInfo.Checksums);
fp.close(); fp.close();
Log(LogNotice, "ApiListener")
<< "Updated meta data for cluster config sync. Checksum: '" << checksumsPath
<< "', timestamp: '" << tsPath << "', auth: '" << authPath << "'.";
} }
/** /**
@ -174,7 +179,7 @@ void ApiListener::SendConfigUpdate(const JsonRpcConnection::Ptr& aclient)
Dictionary::Ptr configUpdateV1 = new Dictionary(); Dictionary::Ptr configUpdateV1 = new Dictionary();
Dictionary::Ptr configUpdateV2 = new Dictionary(); Dictionary::Ptr configUpdateV2 = new Dictionary();
Dictionary::Ptr configUpdateChecksums = new Dictionary(); Dictionary::Ptr configUpdateChecksums = new Dictionary(); /* new since 2.11 */
String zonesDir = GetApiZonesDir(); String zonesDir = GetApiZonesDir();
@ -198,7 +203,7 @@ void ApiListener::SendConfigUpdate(const JsonRpcConnection::Ptr& aclient)
configUpdateV1->Set(zoneName, config.UpdateV1); configUpdateV1->Set(zoneName, config.UpdateV1);
configUpdateV2->Set(zoneName, config.UpdateV2); configUpdateV2->Set(zoneName, config.UpdateV2);
configUpdateChecksums->Set(zoneName, config.Checksums); configUpdateChecksums->Set(zoneName, config.Checksums); /* new since 2.11 */
} }
Dictionary::Ptr message = new Dictionary({ Dictionary::Ptr message = new Dictionary({
@ -437,7 +442,7 @@ Value ApiListener::ConfigUpdateHandler(const MessageOrigin::Ptr& origin, const D
configChange = true; configChange = true;
String path = stageConfigZoneDir + "/" + kv.first; String path = stageConfigZoneDir + "/" + kv.first;
(void) unlink(path.CStr()); Utility::Remove(path);
} }
} }
} }