Merge branch 'bugfix/last-reload-attempt-failed-8428' into feature/icinga-check-output-error-last-reload-failed-7263

Author: Al2Klimov

lib/base/application.cpp

@@ -29,6 +29,7 @@
 #ifdef _WIN32
 #include <windows.h>
 #else /* _WIN32 */
+#include <sys/mman.h>
 #include <signal.h>
 #endif /* _WIN32 */
 
@@ -53,7 +54,26 @@ int Application::m_ArgC;
 char **Application::m_ArgV;
 double Application::m_StartTime;
 bool Application::m_ScriptDebuggerEnabled = false;
-double Application::m_LastReloadFailed;
+
+#ifdef _WIN32
+double Application::m_LastReloadFailed = 0;
+#else /* _WIN32 */
+std::atomic<double>* Application::m_LastReloadFailed = ([]() -> std::atomic<double>* {
+	auto memory (mmap(
+		nullptr, sizeof(std::atomic<double>),
+		PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED, -1, 0
+	));
+	if (memory == MAP_FAILED) {
+		BOOST_THROW_EXCEPTION(posix_error()
+			<< boost::errinfo_api_function("mmap")
+			<< boost::errinfo_errno(errno));
+	}
+
+	auto lrf ((std::atomic<double>*)memory);
+	lrf->store(0);
+	return lrf;
+})();
+#endif /* _WIN32 */
 
 /**
  * Constructor for the Application class.
@@ -1170,12 +1190,20 @@ void Application::SetScriptDebuggerEnabled(bool enabled)
 
 double Application::GetLastReloadFailed()
 {
+#ifdef _WIN32
 	return m_LastReloadFailed;
+#else /* _WIN32 */
+	return m_LastReloadFailed->load();
+#endif /* _WIN32 */
 }
 
 void Application::SetLastReloadFailed(double ts)
 {
+#ifdef _WIN32
 	m_LastReloadFailed = ts;
+#else /* _WIN32 */
+	m_LastReloadFailed->store(ts);
+#endif /* _WIN32 */
 }
 
 void Application::ValidateName(const Lazy<String>& lvalue, const ValidationUtils& utils)

lib/base/application.hpp

@@ -7,6 +7,7 @@
 #include "base/application-ti.hpp"
 #include "base/logger.hpp"
 #include "base/configuration.hpp"
+#include <atomic>
 #include <iosfwd>
 
 namespace icinga
@@ -137,7 +138,11 @@ class Application : public ObjectImpl<Application> {
 	static double m_StartTime;
 	static double m_MainTime;
 	static bool m_ScriptDebuggerEnabled;
+#ifdef _WIN32
 	static double m_LastReloadFailed;
+#else /* _WIN32 */
+	static std::atomic<double> *m_LastReloadFailed;
+#endif /* _WIN32 */
 
 #ifdef _WIN32
 	static BOOL WINAPI CtrlHandler(DWORD type);

lib/cli/daemoncommand.cpp

@@ -757,10 +757,12 @@ int DaemonCommand::Run(const po::variables_map& vm, const std::vector<std::strin
 
 			if (nextWorker == -1) {
 				Log(LogCritical, "Application", "Found error in config: reloading aborted");
+				Application::SetLastReloadFailed(Utility::GetTime());
 			} else {
 				Log(LogInformation, "Application")
 					<< "Reload done, old process shutting down. Child process with PID '" << nextWorker << "' is taking over.";
 
+				Application::SetLastReloadFailed(0);
 				(void)kill(currentWorker, SIGTERM);
 
 				{