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

Only remove directories if they exist during sync

This commit is contained in:
Michael Friedrich 2018-09-28 16:58:59 +02:00
parent 4e9439f2d8
commit 83c11962b2
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -310,7 +310,10 @@ Value ApiListener::ConfigUpdateHandler(const MessageOrigin::Ptr& origin, const D
* runtime production config and newly received configuration. * runtime production config and newly received configuration.
*/ */
String apiZonesStageDir = GetApiZonesStageDir(); String apiZonesStageDir = GetApiZonesStageDir();
if (Utility::PathExists(apiZonesStageDir))
Utility::RemoveDirRecursive(apiZonesStageDir); Utility::RemoveDirRecursive(apiZonesStageDir);
Utility::MkDirP(apiZonesStageDir, 0700); Utility::MkDirP(apiZonesStageDir, 0700);
ObjectLock olock(updateV1); ObjectLock olock(updateV1);
@ -388,7 +391,9 @@ void ApiListener::TryActivateZonesStageCallback(const ProcessResult& pr,
String apiZonesDir = GetApiZonesDir(); String apiZonesDir = GetApiZonesDir();
/* Purge production before copying stage. */ /* Purge production before copying stage. */
if (Utility::PathExists(apiZonesDir))
Utility::RemoveDirRecursive(apiZonesDir); Utility::RemoveDirRecursive(apiZonesDir);
Utility::MkDirP(apiZonesDir, 0700); Utility::MkDirP(apiZonesDir, 0700);
/* Copy all synced configuration files from stage to production. */ /* Copy all synced configuration files from stage to production. */