From: Michael Friedrich <michael.friedrich@icinga.com>
Date: Wed, 7 Aug 2019 10:03:17 +0000 (+0200)
Subject: Log a hint after failed config validation for systemd users
X-Git-Tag: v2.11.0~1^2~46^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01fe243f232dbcbb3e0e17a7008cc88fcbd519b4;p=icinga2

Log a hint after failed config validation for systemd users
---

diff --git a/lib/cli/daemoncommand.cpp b/lib/cli/daemoncommand.cpp
index 4975536ac..a9619c34a 100644
--- a/lib/cli/daemoncommand.cpp
+++ b/lib/cli/daemoncommand.cpp
@@ -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;