Disable console log after activating all config items

fixes #6316

diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp
index ce12db189cdb5404377eb9b7fab421bdd2172f22..773917199bde5cfca1219b041d277fa9da06cf70 100644 (file)
--- a/icinga-app/icinga.cpp
+++ b/icinga-app/icinga.cpp
@@ -185,7 +185,7 @@ static bool Daemonize(void)
                } while (readpid != pid && ret == 0);
 
                if (ret == pid) {
-                       Log(LogCritical, "icinga-app", "The daemon could not be started. See logfile for details.");
+                       Log(LogCritical, "icinga-app", "The daemon could not be started. See log output for details.");
                        exit(EXIT_FAILURE);
                } else if (ret == -1) {
                        std::ostringstream msgbuf;
@@ -546,7 +546,15 @@ int Main(void)
                                return EXIT_FAILURE;
                        }
                }
+       }
+
+       // activate config only after daemonization: it starts threads and that is not compatible with fork()
+       if (!ConfigItem::ActivateItems()) {
+               Log(LogCritical, "icinga-app", "Error activating configuration.");
+               return EXIT_FAILURE;
+       }
 
+       if (g_AppParams.count("daemonize")) {
                String errorLog;
                if (g_AppParams.count("errorlog"))
                        errorLog = g_AppParams["errorlog"].as<std::string>();
@@ -554,12 +562,6 @@ int Main(void)
                SetDaemonIO(errorLog);
                Logger::DisableConsoleLog();
        }
-
-       // activate config only after daemonization: it starts threads and that is not compatible with fork()
-       if (!ConfigItem::ActivateItems()) {
-               Log(LogCritical, "icinga-app", "Error activating configuration.");
-               return EXIT_FAILURE;
-       }
        
 #ifndef _WIN32
        struct sigaction sa;