X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=play-sound-status.py;h=976bed40c542ea4aff6114c2df37f34c4d0eace9;hb=715ff59d360fde630bd111d6fbf143690a52cd42;hp=6daf67c6f84bd7594a54effd1bb92d963acc9333;hpb=2d0afaf84348f60b747bddf16e42d9dc0d134321;p=svn42.git

diff --git a/play-sound-status.py b/play-sound-status.py
index 6daf67c..976bed4 100755
--- a/play-sound-status.py
+++ b/play-sound-status.py
@@ -151,7 +151,7 @@ class UWSConfig:
 
 
 def runRandomAction(action_list,user,args=[]):
-  if not type(action_list) == types.ListType):
+  if not type(action_list) == types.ListType:
     raise ValueError("runRandomAction: action_list must be a list")
   return executeAction(random.choice(action_list),user,args)
 
@@ -190,7 +190,9 @@ def runShellCommand(cmd,ptimeout,stdinput,user,args=[]):
   cmd = cmd.replace("%ARG%"," ".join(args)).replace("%USER%", user)
   if ptimeout is None or float(ptimeout) > 45:
     ptimeout = 45
-  popenTimeout2(cmd,stdinput,ptimeout=float(ptimeout))
+  else:
+    ptimeout = int(float(ptimeout))
+  popenTimeout2(cmd,stdinput,ptimeout=ptimeout)
 
 def executeAction(action_name, user, args=[]):
   if action_name is None:
@@ -201,7 +203,7 @@ def executeAction(action_name, user, args=[]):
     logging.error("executeAction: action %s not found or has no type" % action_name)
     return False
   action_delay=uwscfg.getValue(action_name+"_delay")
-  logging.debug("executeAction, action_name=%s, action_type=%s, action_delay=%s" % (action_name,action_type,action_delay))  
+  logging.info("executeAction %s of type %s for user %s with delay %s" % (action_name,action_type,user,action_delay))  
   if not action_delay is None:
     time.sleep(float(action_delay))
   
@@ -289,7 +291,7 @@ def popenTimeout2(cmd, pinput, returncode_ok=[0], ptimeout=21):
     return False
 
 def exitHandler(signum, frame):
-  logging.info("Update-Web-Status stopping")
+  logging.info("stopping")
   try:
     conn.close()
   except: