X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/91c3451346afd2d5c1ae5b7600acc77b540c9e3b..dfd60ef69a6fa4b790250431f9b7fde6da084ec9:/libtuer.py

diff --git a/libtuer.py b/libtuer.py
index 835bf6d..f79dcc6 100644
--- a/libtuer.py
+++ b/libtuer.py
@@ -5,7 +5,7 @@ import email.mime.text, email.utils
 # Logging configuration
 syslogLevel = logging.INFO
 mailLevel   = logging.CRITICAL # must be "larger" than syslog level!
-mailAddress = ['post+tuer'+'@'+'ralfj.de', 'vorstand@lists.hacksaar.de']
+from config import mailAddress
 printLevel  = logging.DEBUG
 
 # Mail logging handler
@@ -111,6 +111,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()