SubprocessMethod TimeOut(time) exception

tango-controls · Mar 31, 2020 · 033e73b · 033e73b
1 parent e53b1f9
commit 033e73b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/fandango/threads.py b/fandango/threads.py
@@ -1164,7 +1164,7 @@ def _remove_task(self,item=None):
 
 def SubprocessMethod(obj,*args,**kwargs):
     """
-    arguments: 
+    arguments (this will be extracted from kwargs): 
         object : object to extract method or callable
         method :  string or callable to get from object
         timeout : seconds 
@@ -1234,7 +1234,7 @@ def do_it(o,m,conn,*a,**k):
     proc.terminate(),proc.join() #close process
 
     if time.time()>t0+timeout:
-        result = Exception('TimeOut(%s)!'%str(obj))
+        result = Exception('TimeOut(%s,%s)!'%(str(obj),timeout))
     if callback:
         callback(result)
     elif isinstance(result,Exception):