[Fuego] [PATCH 13/30] ftc exec: convert timeout to time units

Daniel Sangorrin daniel.sangorrin at toshiba.co.jp
Mon Jun 4 07:17:47 UTC 2018


Signed-off-by: Daniel Sangorrin <daniel.sangorrin at toshiba.co.jp>
---
 engine/scripts/ftc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/engine/scripts/ftc b/engine/scripts/ftc
index 7a9d23c..fc900ed 100755
--- a/engine/scripts/ftc
+++ b/engine/scripts/ftc
@@ -2966,7 +2966,14 @@ def ftc_exec_command(command, timeout):
 
     # specify timeout for command operation
     signal.signal(signal.SIGALRM, alarm_handler)
-    signal.alarm(timeout)
+
+    # timeout is passed as integer[dhms] (dhms: days, hours, minutes, seconds)
+    print "timeout is: " + timeout
+    units = timeout[:-1]
+    multiplier = {"d": 24*60*60, "h": 60*60, "m": 60, "s": 1}
+    time = int(units)*multiplier[timeout[-1]]
+    print "setting alarm to: " + str(time) + " seconds"
+    signal.alarm(time)
 
     try:
         # p.poll returns exit code when process completes
-- 
2.7.4




More information about the Fuego mailing list