Log warning when sysconfig file cannot be read

refs #6215

refs #6241

diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp
index 31f6dc3d4270a7ab254eeadb2347be79d1f4d50c..c822d93512ad4deab00a175aebe059fd4fd9aeeb 100644 (file)
--- a/icinga-app/icinga.cpp
+++ b/icinga-app/icinga.cpp
@@ -154,6 +154,13 @@ int Main(void)
 
        Application::DeclareZonesDir(Application::GetSysconfDir() + "/icinga2/zones.d");
 
+#ifndef _WIN32
+       if (!Utility::PathExists(Application::GetSysconfigFile())) {
+               Log(LogWarning, "icinga-app")
+                       << "Sysconfig file '" << Application::GetSysconfigFile() << "' cannot be read. Using default values.";
+       }
+#endif /* _WIN32 */
+
        String icingaUser = Utility::GetFromSysconfig("ICINGA2_USER");
        if (icingaUser.IsEmpty())
                icingaUser = ICINGA_USER;
@@ -468,6 +475,7 @@ int Main(void)
 
                        std::cout << visibleDesc << std::endl
                                << "Report bugs at <https://github.com/Icinga/icinga2>" << std::endl
+                               << "Get support: <https://www.icinga.com/support/>" << std::endl
                                << "Icinga home page: <https://www.icinga.com/>" << std::endl;
                        return EXIT_SUCCESS;
                }

diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp
index 9aaddb8baaa61426a9d3bbab8dad6f7f1beb3149..cd2e2bf0d714e577bc8cf0b96b86aabdc8efdb11 100644 (file)
--- a/lib/base/utility.cpp
+++ b/lib/base/utility.cpp
@@ -1958,6 +1958,9 @@ String Utility::GetFromSysconfig(const String& env)
        if (sysconf.IsEmpty())
                return "";
 
+       if (!Utility::PathExists(sysconf))
+               return "";
+
        String cmdInner = ". " + EscapeShellArg(sysconf) + " 2>&1 >/dev/null;echo \"$" + env + "\"";
        String cmd = "sh -c " + EscapeShellArg(cmdInner);