From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Mon, 16 Jun 2008 18:48:34 +0000 (+0000)
Subject: add timeout
X-Git-Tag: Monitor-1.0-5~14
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=952bafdf647c59f894cfddbd97ddcfc63aa9ab80;p=monitor.git

add timeout
---

diff --git a/soltesz.py b/soltesz.py
index 3b0eed0..eb44910 100644
--- a/soltesz.py
+++ b/soltesz.py
@@ -167,17 +167,17 @@ class CMD:
 	def __init__(self):
 		pass
 
-	def run_noexcept(self, cmd):
+	def run_noexcept(self, cmd, timeout=COMMAND_TIMEOUT*2):
 
 		s = Sopen(cmd, shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
 		#(f_in, f_out, f_err) = os.popen3(cmd)
 		(f_in, f_out, f_err) = (s.stdin, s.stdout, s.stderr)
-		lout, lin, lerr = select([f_out,f_err], [], [], COMMAND_TIMEOUT*2)
+		lout, lin, lerr = select([f_out,f_err], [], [], timeout)
 		if len(lin) == 0 and len(lout) == 0 and len(lerr) == 0:
 			# Reached a timeout!
 			#print "TODO: kill subprocess: '%s'" % cmd
 			# TODO: kill subprocess??
-			s.kill()
+			s.kill(signal.SIGKILL)
 			return ("", "SCRIPTTIMEOUT")
 		o_value = f_out.read()
 		e_value = ""
@@ -190,6 +190,12 @@ class CMD:
 		f_out.close()
 		f_in.close()
 		f_err.close()
+		try:
+			s.kill()
+		except OSError:
+			# no such process, due to it already exiting...
+			pass
+
 		return (o_value, e_value)
 
 	def run_noexcept2(self, cmd):