Fix command timeout.

Fixes #6232

lib/base/process.cpp

@@ -155,11 +155,12 @@ void Process::IOThreadProc(int tid)
 	pollfd *pfds = NULL;
 #endif /* _WIN32 */
 	int count = 0;
+	double now;
 
 	Utility::SetThreadName("ProcessIO");
 
 	for (;;) {
-		double now, timeout = -1;
+		double timeout = -1;
 
 		now = Utility::GetTime();
 
@@ -202,7 +203,9 @@ void Process::IOThreadProc(int tid)
 			}
 		}
 
-		if (timeout != -1)
+		if (timeout < 0.01)
+			timeout = 0.5;
+
 		timeout *= 1000;
 
 #ifdef _WIN32
@@ -214,6 +217,8 @@ void Process::IOThreadProc(int tid)
 			continue;
 #endif /* _WIN32 */
 
+		now = Utility::GetTime();
+
 		{
 			boost::mutex::scoped_lock lock(l_ProcessMutex[tid]);
 
@@ -228,17 +233,12 @@ void Process::IOThreadProc(int tid)
 #endif /* _WIN32 */
 
 			for (int i = 1; i < count; i++) {
-#ifdef _WIN32
-				if (rc == WAIT_OBJECT_0 + i) {
-#else /* _WIN32 */
-				if (pfds[i].revents & (POLLIN | POLLHUP | POLLERR)) {
 				std::map<ConsoleHandle, ProcessHandle>::iterator it2;
 				it2 = l_FDs[tid].find(pfds[i].fd);
 
 				if (it2 == l_FDs[tid].end())
 					continue; /* This should never happen. */
 
-#endif /* _WIN32 */
 				std::map<ProcessHandle, Process::Ptr>::iterator it;
 #ifdef _WIN32
 				it = l_Processes[tid].find(handles[i]);
@@ -249,6 +249,20 @@ void Process::IOThreadProc(int tid)
 				if (it == l_Processes[tid].end())
 					continue; /* This should never happen. */
 
+				bool is_timeout = false;
+
+				if (it->second->m_Timeout != 0) {
+					double timeout = it->second->m_Result.ExecutionStart + it->second->m_Timeout;
+
+					if (timeout < now)
+						is_timeout = true;
+				}
+
+#ifdef _WIN32
+				if (rc == WAIT_OBJECT_0 + i || is_timeout) {
+#else /* _WIN32 */
+				if (pfds[i].revents & (POLLIN | POLLHUP | POLLERR) || is_timeout) {
+#endif /* _WIN32 */
 					if (!it->second->DoEvents()) {
 #ifdef _WIN32
 						CloseHandle(it->first);
@@ -562,19 +576,24 @@ void Process::Run(const boost::function<void(const ProcessResult&)>& callback)
 
 bool Process::DoEvents(void)
 {
-	if (m_Timeout != 0) {
-		double timeout = m_Timeout - (Utility::GetTime() - m_Result.ExecutionStart);
+	bool is_timeout = false;
 
-		if (timeout < 0) {
+	if (m_Timeout != 0) {
+		double timeout = m_Result.ExecutionStart + m_Timeout;
+
+		if (timeout < Utility::GetTime()) {
 			m_OutputStream << "<Timeout exceeded.>";
 #ifdef _WIN32
 			TerminateProcess(m_Process, 1);
 #else /* _WIN32 */
 			kill(m_Process, SIGKILL);
 #endif /* _WIN32 */
+
+			is_timeout = true;
 		}
 	}
 
+	if (!is_timeout) {
 		char buffer[512];
 		for (;;) {
 #ifdef _WIN32
@@ -599,6 +618,7 @@ bool Process::DoEvents(void)
 
 			break;
 		}
+	}
 
 	String output = m_OutputStream.str();
 

lib/icinga/command.ti

@@ -8,7 +8,7 @@ abstract class Command : DynamicObject
 	[config] Value command (CommandLine);
 	[config] Value arguments;
 	[config] Value timeout {
-		default {{{ return 300; }}}
+		default {{{ return 60; }}}
 	};
 	[config] Dictionary::Ptr env;
 };