tidied up fire_and_forget_cmd for sound playing

diff --git a/libtuer.py b/libtuer.py
index f79dcc6cf4c9403fb0dbcb2bd3ebfc6db7d1996b..c9eceec42fa99ae4537563a62002300516485f86 100644 (file)
--- a/libtuer.py
+++ b/libtuer.py
@@ -71,12 +71,13 @@ def fire_and_forget(f):
 
 # run a command asynchronously and log the return value if not 0
 # prefix must be a string identifying the code position where the call came from
 
 # run a command asynchronously and log the return value if not 0
 # prefix must be a string identifying the code position where the call came from

-def fire_and_forget_cmd (cmd, log, prefix):
+def fire_and_forget_cmd (cmd, log_prefix):
+       logger.debug("Firing and forgetting command from %s: %s" % (log_prefix,str(cmd)))

        def _fire_and_forget_cmd ():
                with open("/dev/null", "w") as fnull:
                        retcode = subprocess.call(cmd, stdout=fnull, stderr=fnull)
                        if retcode is not 0:
        def _fire_and_forget_cmd ():
                with open("/dev/null", "w") as fnull:
                        retcode = subprocess.call(cmd, stdout=fnull, stderr=fnull)
                        if retcode is not 0:

-                               logger.error("%sReturn code %d at command: %s" % (prefix,retcode,str(cmd)))
+                               logger.error("%sReturn code %d at command: %s" % (log_prefix,retcode,str(cmd)))

        fire_and_forget(_fire_and_forget_cmd)
 
 # Threaded callback class
        fire_and_forget(_fire_and_forget_cmd)
 
 # Threaded callback class

diff --git a/statemachine.py b/statemachine.py
index b647ac95bcfa7e183b8a68f60f29273bf1a2deb3..3e222069e264f7f9d457149ec14adc6bf936c0de 100644 (file)
--- a/statemachine.py
+++ b/statemachine.py
@@ -11,7 +11,7 @@ def play_sound (what):
                logger.error("StateMachine: Unable to list sound files in %s" % (SOUNDS_DIRECTORY+what))
                return
        soundfile = SOUNDS_DIRECTORY + what + '/' + random.choice(soundfiles)
                logger.error("StateMachine: Unable to list sound files in %s" % (SOUNDS_DIRECTORY+what))
                return
        soundfile = SOUNDS_DIRECTORY + what + '/' + random.choice(soundfiles)

-       fire_and_forget_cmd ([SOUNDS_PLAYER,soundfile], logger.error, "StateMachine: ")
+       fire_and_forget_cmd ([SOUNDS_PLAYER,soundfile], "StateMachine: ")

 
 # convert an absolute nervlist to a relative one
 def nervlist_abs2rel(nervlist_abs):
 
 # convert an absolute nervlist to a relative one
 def nervlist_abs2rel(nervlist_abs):