tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-26 23:24:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: Deadlock in SigHupHandler due to Event::Post not being signal-safe

Browse Source 
Fixes #3622
This commit is contained in:
Gunnar Beutner 2013-02-03 16:00:53 +01:00
parent b997462eef
commit 2834edfd71
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
icinga-app/icinga.cpp
View File

@ -33,6 +33,11 @@ namespace po = boost::program_options;
static po::variables_map g_AppParams; static po::variables_map g_AppParams;
static vector<ConfigItem::WeakPtr> g_ConfigItems; static vector<ConfigItem::WeakPtr> g_ConfigItems;
#ifndef _WIN32
static bool g_ReloadConfig = false;
static Timer::Ptr g_ReloadConfigTimer;
#endif /* _WIN32 */
static bool LoadConfigFiles(void) static bool LoadConfigFiles(void)
{ {
set<ConfigItem::Ptr> allItems; set<ConfigItem::Ptr> allItems;
@ -97,13 +102,20 @@ static bool LoadConfigFiles(void)
} }
static void ReloadConfigTimerHandler(void)
{
if (g_ReloadConfig) {
Logger::Write(LogInformation, "icinga-app", "Received SIGHUP. Reloading config files.");
LoadConfigFiles();
g_ReloadConfig = false;
}
}
static void SigHupHandler(int signum) static void SigHupHandler(int signum)
{ {
assert(signum == SIGHUP); assert(signum == SIGHUP);
Logger::Write(LogInformation, "icinga-app", "Received SIGHUP. Reloading config files."); g_ReloadConfig = true;
Event::Post(boost::bind(&LoadConfigFiles));
} }
/** /**
@ -252,6 +264,11 @@ int main(int argc, char **argv)
memset(&sa, 0, sizeof(sa)); memset(&sa, 0, sizeof(sa));
sa.sa_handler = &SigHupHandler; sa.sa_handler = &SigHupHandler;
sigaction(SIGHUP, &sa, NULL); sigaction(SIGHUP, &sa, NULL);
g_ReloadConfigTimer = boost::make_shared<Timer>();
g_ReloadConfigTimer->SetInterval(1);
g_ReloadConfigTimer->OnTimerExpired.connect(boost::bind(&ReloadConfigTimerHandler));
g_ReloadConfigTimer->Start();
#endif /* _WIN32 */ #endif /* _WIN32 */
return app->Run(); return app->Run();