tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix: Plugin-based checks are broken. 

Fixes #5751
This commit is contained in:
Gunnar Beutner 2014-03-13 12:05:27 +01:00
parent 76001c70e3
commit 51dc2bea2d
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/base/process-unix.cpp
View File

@ -47,6 +47,7 @@ extern char **environ;
static boost::mutex l_ProcessMutex;
static std::map<int, Process::Ptr> l_Processes;
static int l_EventFDs[2];
static boost::once_flag l_OnceFlag = BOOST_ONCE_INIT;
INITIALIZE_ONCE(&Process::StaticInitialize);
@ -71,7 +72,11 @@ void Process::StaticInitialize(void)
Utility::SetNonBlocking(l_EventFDs[0]);
Utility::SetNonBlocking(l_EventFDs[1]);
}
void Process::ThreadInitialize(void)
{
/* Note to self: Make sure this runs _after_ we've daemonized. */
boost::thread t(&Process::IOThreadProc);
t.detach();
}
@ -141,6 +146,8 @@ void Process::IOThreadProc(void)
void Process::Run(const boost::function<void (const ProcessResult&)>& callback)
{
boost::call_once(l_OnceFlag, &Process::ThreadInitialize);
m_Result.ExecutionStart = Utility::GetTime();
int fds[2];

1
lib/base/process.h
View File

@ -69,6 +69,7 @@ public:
#ifndef _WIN32
static void StaticInitialize(void);
static void ThreadInitialize(void);
#endif /* _WIN32 */
private: