From 99f4e5203866c4268fd38e9529ea36c511a4627a Mon Sep 17 00:00:00 2001 From: realraum Date: Sun, 8 Aug 2010 17:58:51 +0000 Subject: [PATCH] .. --- play-sound-status.py | 8 +++++--- switch-power.py | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/play-sound-status.py b/play-sound-status.py index 2c30122..976bed4 100755 --- a/play-sound-status.py +++ b/play-sound-status.py @@ -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: diff --git a/switch-power.py b/switch-power.py index 0c8069d..7e6b77c 100755 --- a/switch-power.py +++ b/switch-power.py @@ -210,10 +210,10 @@ def eventNobodyHere(): def eventPanic(): logging.info("eventPanic(): switching around: "+uwscfg.slug_ids_panic) lst1 = uwscfg.slug_ids_panic.split(" ") - lst2 = map(lambda e:[e,True], lst1) + lst2 = map(lambda e:[e,False], lst1) for id in lst1: - switchPower(id,True) - for delay in map(lambda e: (40-e)/33.0,range(0,20)): + switchPower(id,False) + for delay in map(lambda e: (40-e)/33.0,range(10,33)): e = random.choice(lst2) e[1]=not e[1] switchPower(e[0],e[1]) -- 1.7.10.4