Wait a bit more before starting to complain

[saartuer.git] / libtuer.py

diff --git a/libtuer.py b/libtuer.py
index 01c04ae5d725863fecefe6fceddcae4f931833d2..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
-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:
-                               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
@@ -111,6 +112,13 @@ class ThreadFunction():
                self._q.put((ThreadFunction._CALL, arg))
        
        def stop(self):
+               # empty the queue
+               try:
+                       while True:
+                               self._q.get_nowait()
+               except queue.Empty:
+                       pass
+               # now wait till the job-in-progress is done
                self._q.put((ThreadFunction._TERM, None))
                self._t.join()