diff --git a/src/util.py b/src/util.py --- a/src/util.py +++ b/src/util.py @@ -12,7 +12,8 @@ colorNames={BLACK:"B",WHITE:"W"} class MsgQueue: - def __init__(self,handler=None): + def __init__(self,name,handler=None): + self.name=name self._queue=multiprocessing.Queue() self._event=multiprocessing.Event() self._handleEvent=handler @@ -30,11 +31,10 @@ class MsgQueue: msg=self._queue.get() if self._queue.empty(): self._event.clear() - log.info(msg) - if msg[0]=="!kill": - self._queue.cancel_join_thread() - break + log.info(msg if msg[0]!="putFrame" else "('putFrame', ..., {})") + if msg[0]=="!kill": break self._handleEvent(msg) + log.info("%s MsgQueue exiting.",self.name) def setHandler(self,handler): self._handleEvent=handler