grml

[svn42.git] / play-sound-status.py

diff --git a/play-sound-status.py b/play-sound-status.py
index 51edf69..d0ecf2a 100755 (executable)
--- a/play-sound-status.py
+++ b/play-sound-status.py
@@ -138,13 +138,14 @@ class UWSConfig:
 
 
 
-def runRemoteCommand(config,args=[]):
+def runRemoteCommand(remote_host,remote_shell,args=[]):
   global sshp,uwscfg
   sshp = None
   try:
-    cmd = "ssh -i /flash/tuer/id_rsa -o PasswordAuthentication=no -o StrictHostKeyChecking=no %RHOST% %RSHELL%".replace("%RHOST%",uwscfg.getValue(config+"_remote_host")).replace("%RSHELL%",uwscfg.getValue(config+"_remote_shell")).replace("%ARG%"," ".join(args)).split(" ")
-    logging.debug("runRemoteCommand: Executing: "+" ".join(cmd))
-    sshp = subprocess.Popen(cmd, bufsize=1024, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=False)
+    cmd = "ssh -i /flash/tuer/id_rsa -o PasswordAuthentication=no -o StrictHostKeyChecking=no %RHOST% %RSHELL%"
+    cmd = cmd.replace("%RHOST%",remote_host).replace("%RSHELL%",remote_shell).replace("%ARG%", " ".join(args))
+    logging.debug("runRemoteCommand: Executing: "+cmd)
+    sshp = subprocess.Popen(cmd.split(" "), bufsize=1024, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=False)
     logging.debug("runRemoteCommand: pid %d: running=%d" % (sshp.pid,sshp.poll() is None))
     if not sshp.poll() is None:
       logging.error("runRemoteCommand: subprocess %d not started ?, returncode: %d" % (sshp.pid,sshp.returncode))
@@ -167,16 +168,14 @@ def runRemoteCommand(config,args=[]):
           subprocess.call(["kill","-9",str(sshp.pid)])
     time.sleep(5)
 
-def runShellCommand(config,args=[]):
+def runShellCommand(cmd,ptimeout,stdinput,args=[]):
   global uwscfg
-  cmd = uwscfg.getValue(config+"_cmd").replace("%ARG%"," ".join(args))
-  ptimeout = uwscfg.getValue(config+"_timeout")
-  stdinput = uwscfg.getValue(config+"_stdinput")
+  cmd = cmd.replace("%ARG%"," ".join(args))
   if ptimeout is None or float(ptimeout) > 45:
     ptimeout = 45
   popenTimeout2(cmd,stdinput,float(ptimeout))
 
-def executeAction(action_name, user, args=[]):
+def executeAction(action_name, args=[]):
   if action_name is None:
     logging.error("executeAction: action_name is None")
     return False
@@ -185,7 +184,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, user=%s, action_name=%s, action_type=%s, action_delay=%s" % (user,action_name,action_type,action_delay))  
+  logging.debug("executeAction, action_name=%s, action_type=%s, action_delay=%s" % (action_name,action_type,action_delay))  
   if not action_delay is None:
     time.sleep(float(action_delay))
   
@@ -195,9 +194,9 @@ def executeAction(action_name, user, args=[]):
   
   #"registered" actions
   if action_type == "remotecmd":
-    return runRemoteCommand(action_type,args)
+    return runRemoteCommand(uwscfg.getValue(action_name+"_remote_host"), uwscfg.getValue(action_name+"_remote_shell"), args)
   elif action_type == "shellcmd":
-    return runShellCommand(action_type,args)
+    return runShellCommand(cmd=uwscfg.getValue(action_name+"_cmd"), ptimeout=uwscfg.getValue(action_name+"_timeout"), stdinput=uwscfg.getValue(action_name+"_stdinput"), args=args)
   else:
     return executeAction(action_type,args)
   
@@ -207,7 +206,8 @@ def playThemeOf(user):
   config=uwscfg.getValue("mapping_"+str(user))
   if config is None:
     config=uwscfg.getValue("mapping_default")
-  executeAction(config,user)
+  logging.debug("playThemeOf: action for user %s: %s" % (user,config))
+  executeAction(config)
 
 def popenTimeout1(cmd, pinput, returncode_ok=[0], ptimeout = 20.0, pcheckint = 0.25):
   logging.debug("popenTimeout1: starting: " + cmd)