upstream/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2026-04-22 14:47:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Log a hint after failed config validation for systemd users

Browse source
This commit is contained in:
Michael Friedrich 2019-08-07 12:03:17 +02:00
parent 6418c2ebb7
commit 01fe243f23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/cli/daemoncommand.cpp
View 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;