Shutdown timers cleanly on exit

refs #7327

diff --git a/lib/base/timer.cpp b/lib/base/timer.cpp
index 07a4f30de413acb662773768afca60d3d53c169f..6abac8566e7a4506a0d60ddb4a5e3d63764c02b5 100644 (file)
--- a/lib/base/timer.cpp
+++ b/lib/base/timer.cpp
@@ -1,5 +1,6 @@
 /* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
 
+#include "base/defer.hpp"
 #include "base/timer.hpp"
 #include "base/debug.hpp"
 #include "base/logger.hpp"
@@ -57,6 +58,8 @@ static bool l_StopTimerThread;
 static TimerSet l_Timers;
 static int l_AliveTimers = 0;
 
+static Defer l_ShutdownTimersCleanlyOnExit (&Timer::Uninitialize);
+
 /**
  * Destructor for the Timer class.
  */