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

Fix Process timeouts. 

Fixes #5759
This commit is contained in:
Gunnar Beutner 2014-03-14 12:16:49 +01:00
parent 2f7881736e
commit 5252041c6b
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,7 +87,9 @@ void Process::IOThreadProc(void)
int count = 0; int count = 0;
for (;;) { for (;;) {
double timeout = 1; double now, timeout = -1;
now = Utility::GetTime();
{ {
boost::mutex::scoped_lock lock(l_ProcessMutex); boost::mutex::scoped_lock lock(l_ProcessMutex);
@ -106,8 +108,12 @@ void Process::IOThreadProc(void)
pfds[i].events = POLLIN; pfds[i].events = POLLIN;
pfds[i].revents = 0; pfds[i].revents = 0;
if (kv.second->GetTimeout() != 0 && kv.second->GetTimeout() < timeout) if (kv.second->m_Timeout != 0) {
timeout = kv.second->GetTimeout(); double delta = kv.second->m_Timeout - (now - kv.second->m_Result.ExecutionStart);
if (timeout == -1 || delta < timeout)
timeout = delta;
}
i++; i++;
} }
@ -295,7 +301,7 @@ bool Process::DoEvents(void)
if (rc > 0) { if (rc > 0) {
m_OutputStream.write(buffer, rc); m_OutputStream.write(buffer, rc);
return true; continue;
} }
break; break;