Ensure that obsolete comment/downtime objects are deleted after activating objects

Config validation shouldn't be able to purge the files, only on
restart.

fixes #11890

diff --git a/lib/cli/daemoncommand.cpp b/lib/cli/daemoncommand.cpp
index 5d8e6f5dde916bb3287b90d5b3ab940dcea181ac..54bdda4504780ca97e687cb554f6fe24d9caf52f 100644 (file)
--- a/lib/cli/daemoncommand.cpp
+++ b/lib/cli/daemoncommand.cpp
@@ -20,6 +20,7 @@
 #include "cli/daemoncommand.hpp"
 #include "cli/daemonutility.hpp"
 #include "remote/apilistener.hpp"
+#include "remote/configobjectutility.hpp"
 #include "config/configcompiler.hpp"
 #include "config/configcompilercontext.hpp"
 #include "config/configitembuilder.hpp"
@@ -296,6 +297,9 @@ int DaemonCommand::Run(const po::variables_map& vm, const std::vector<std::strin
                Logger::DisableConsoleLog();
        }
 
+       /* Remove ignored Downtime/Comment objects. */
+       ConfigItem::RemoveIgnoredItems(ConfigObjectUtility::GetConfigDir());
+
 #ifndef _WIN32
        struct sigaction sa;
        memset(&sa, 0, sizeof(sa));

diff --git a/lib/cli/daemonutility.cpp b/lib/cli/daemonutility.cpp
index 84470cfab49a0e51cc3dfe2e1e9ff7e3175a3b1d..a6fe4555fd3c7833605af31f9f85d8c363525b7a 100644 (file)
--- a/lib/cli/daemonutility.cpp
+++ b/lib/cli/daemonutility.cpp
@@ -24,7 +24,6 @@
 #include "config/configcompiler.hpp"
 #include "config/configcompilercontext.hpp"
 #include "config/configitembuilder.hpp"
-#include "remote/configobjectutility.hpp"
 
 
 using namespace icinga;
@@ -169,9 +168,6 @@ bool DaemonUtility::LoadConfigFiles(const std::vector<std::string>& configs,
        WorkQueue upq(25000, Application::GetConcurrency());
        bool result = ConfigItem::CommitItems(ascope.GetContext(), upq, newItems);
 
-       /* Remove ignored Downtime/Comment objects. */
-       ConfigItem::RemoveIgnoredItems(ConfigObjectUtility::GetConfigDir());
-
        if (!result)
                return false;