]> granicus.if.org Git - icinga2/commitdiff
Log a hint after failed config validation for systemd users 7397/head
authorMichael Friedrich <michael.friedrich@icinga.com>
Wed, 7 Aug 2019 10:03:17 +0000 (12:03 +0200)
committerMichael Friedrich <michael.friedrich@icinga.com>
Wed, 7 Aug 2019 10:03:17 +0000 (12:03 +0200)
lib/cli/daemoncommand.cpp

index 4975536ac18b82061a4ba5e7387f7a8b4f625e0a..a9619c34a672bcce0a0f249182bc35ae7e88d180 100644 (file)
@@ -206,8 +206,10 @@ int RunWorker(const std::vector<std::string>& configs, bool closeConsoleLog = fa
        {
                std::vector<ConfigItem::Ptr> newItems;
 
-               if (!DaemonUtility::LoadConfigFiles(configs, newItems, Configuration::ObjectsPath, Configuration::VarsPath))
+               if (!DaemonUtility::LoadConfigFiles(configs, newItems, Configuration::ObjectsPath, Configuration::VarsPath)) {
+                       Log(LogCritical, "cli", "Config validation failed. Re-run with 'icinga2 daemon -C' after fixing the config.");
                        return EXIT_FAILURE;
+               }
 
 #ifndef _WIN32
                Log(LogNotice, "cli")
@@ -571,8 +573,10 @@ int DaemonCommand::Run(const po::variables_map& vm, const std::vector<std::strin
 
                std::vector<ConfigItem::Ptr> newItems;
 
-               if (!DaemonUtility::LoadConfigFiles(configs, newItems, Configuration::ObjectsPath, Configuration::VarsPath))
+               if (!DaemonUtility::LoadConfigFiles(configs, newItems, Configuration::ObjectsPath, Configuration::VarsPath)) {
+                       Log(LogCritical, "cli", "Config validation failed. Re-run with 'icinga2 daemon -C' after fixing the config.");
                        return EXIT_FAILURE;
+               }
 
                Log(LogInformation, "cli", "Finished validating the configuration file(s).");
                return EXIT_SUCCESS;