From: Michael Friedrich <michael.friedrich@icinga.com>
Date: Thu, 19 Jul 2018 11:34:12 +0000 (+0200)
Subject: Add debug logging for daemonize/timers
X-Git-Tag: v2.9.1~3^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7519d23892c3478148ff297d63cc535a88dfc382;p=icinga2

Add debug logging for daemonize/timers

The previous commit is 1:1 the same I've implemented
here already. Great teamwork with Alex :)

refs #6445
---

diff --git a/lib/base/application.cpp b/lib/base/application.cpp
index cfa728caa..4287c7687 100644
--- a/lib/base/application.cpp
+++ b/lib/base/application.cpp
@@ -138,9 +138,10 @@ void Application::InitializeBase()
 
 	Loader::ExecuteDeferredInitializers();
 
-	/* make sure the thread pool gets initialized */
+	/* Make sure the thread pool gets initialized. */
 	GetTP().Start();
 
+	/* Make sure the timer thread gets initialized. */
 	Timer::Initialize();
 }
 
@@ -302,7 +303,6 @@ void Application::SetArgV(char **argv)
  */
 void Application::RunEventLoop()
 {
-
 #ifdef HAVE_SYSTEMD
 	sd_notify(0, "READY=1");
 #endif /* HAVE_SYSTEMD */
diff --git a/lib/base/timer.cpp b/lib/base/timer.cpp
index 95e3f5b6d..65c7ee626 100644
--- a/lib/base/timer.cpp
+++ b/lib/base/timer.cpp
@@ -19,6 +19,7 @@
 
 #include "base/timer.hpp"
 #include "base/debug.hpp"
+#include "base/logger.hpp"
 #include "base/utility.hpp"
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition_variable.hpp>
@@ -259,6 +260,8 @@ void Timer::AdjustTimers(double adjustment)
  */
 void Timer::TimerThreadProc()
 {
+	Log(LogDebug, "Timer", "TimerThreadProc started.");
+
 	Utility::SetThreadName("Timer Thread");
 
 	for (;;) {
diff --git a/lib/cli/daemoncommand.cpp b/lib/cli/daemoncommand.cpp
index f663d1046..ba2dade47 100644
--- a/lib/cli/daemoncommand.cpp
+++ b/lib/cli/daemoncommand.cpp
@@ -88,6 +88,9 @@ static bool Daemonize()
 		_exit(EXIT_SUCCESS);
 	}
 
+	Log(LogDebug, "Daemonize()")
+		<< "Child process with PID " << Utility::GetPid() << " continues; re-initializing base.";
+
 	Application::InitializeBase();
 #endif /* _WIN32 */