Commit 91c34513 authored by Ralf's avatar Ralf
Browse files

libtuer: add a fire_and_forget for python functions

parent 344d58d1
...@@ -58,16 +58,26 @@ class Logger: ...@@ -58,16 +58,26 @@ class Logger:
logger = Logger() logger = Logger()
# run a Python command asynchronously
def fire_and_forget(f):
def _fire_and_forget():
try:
f()
except Exception as e:
logger.critical("fire_and_forget: Got exception out of callback: %s" % str(e))
logger.debug(traceback.format_exc())
t = threading.Thread(target=_fire_and_forget)
t.start()
# run a command asynchronously and log the return value if not 0 # 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 # prefix must be a string identifying the code position where the call came from
def fire_and_forget (cmd, log, prefix): def fire_and_forget_cmd (cmd, log, prefix):
def _fire_and_forget (): def _fire_and_forget_cmd ():
with open("/dev/null", "w") as fnull: with open("/dev/null", "w") as fnull:
retcode = subprocess.call(cmd, stdout=fnull, stderr=fnull) retcode = subprocess.call(cmd, stdout=fnull, stderr=fnull)
if retcode is not 0: 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" % (prefix,retcode,str(cmd)))
t = threading.Thread(target=_fire_and_forget) fire_and_forget(_fire_and_forget_cmd)
t.start()
# Threaded callback class # Threaded callback class
class ThreadFunction(): class ThreadFunction():
......
...@@ -11,7 +11,7 @@ def play_sound (what): ...@@ -11,7 +11,7 @@ def play_sound (what):
logger.error("StateMachine: Unable to list sound files in %s" % (SOUNDS_DIRECTORY+what)) logger.error("StateMachine: Unable to list sound files in %s" % (SOUNDS_DIRECTORY+what))
return return
soundfile = SOUNDS_DIRECTORY + what + '/' + random.choice(soundfiles) soundfile = SOUNDS_DIRECTORY + what + '/' + random.choice(soundfiles)
fire_and_forget ([SOUNDS_PLAYER,soundfile], logger.error, "StateMachine: ") fire_and_forget_cmd ([SOUNDS_PLAYER,soundfile], logger.error, "StateMachine: ")
# StateUnlocking constants # StateUnlocking constants
...@@ -175,8 +175,7 @@ class StateMachine(): ...@@ -175,8 +175,7 @@ class StateMachine():
def _close_after_time(): def _close_after_time():
time.sleep(FALLBACK_LEAVE_DELAY_LOCK) time.sleep(FALLBACK_LEAVE_DELAY_LOCK)
self.actor().act(Actor.CMD_LOCK) self.actor().act(Actor.CMD_LOCK)
t = threading.Thread(target=_close_after_time) fire_and_forget(_close_after_time)
t.start()
# not calling superclass because we want to stay in fallback mode # not calling superclass because we want to stay in fallback mode
def handle_wakeup_event(self): def handle_wakeup_event(self):
# blink red LED # blink red LED
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment