Making the ZMQ logger better protected, and more able to shut down itself... so we don't get stuck on program exit waiting forever for a ZMQ polling event.

Author: jonoomph

src/classes/logger_libopenshot.py

@@ -38,9 +38,17 @@ class LoggerLibOpenShot(Thread):
     def __init__(self):
         super().__init__()
         self.daemon = True
+        self.running = False
+        self.context = None
+        self.socket = None
+
 
     def kill(self):
         self.running = False
+        if self.context:
+            self.context.destroy()
+        if self.socket:
+            self.socket.close()
 
     def run(self):
         # Running
@@ -63,23 +71,25 @@ def run(self):
         openshot.ZmqLogger.Instance().Enable(debug_enabled)
 
         # Socket to talk to server
-        context = zmq.Context()
-        socket = context.socket(zmq.SUB)
-        socket.setsockopt_string(zmq.SUBSCRIBE, '')
+        self.context = zmq.Context()
+        self.socket = self.context.socket(zmq.SUB)
+        self.socket.setsockopt_string(zmq.SUBSCRIBE, '')
 
         poller = zmq.Poller()
-        poller.register(socket, zmq.POLLIN)
+        poller.register(self.socket, zmq.POLLIN)
 
         log.info("Connecting to libopenshot with debug port: %s" % port)
-        socket.connect ("tcp://localhost:%s" % port)
+        self.socket.connect("tcp://localhost:%s" % port)
 
         while self.running:
             msg = None
 
             # Receive all debug message sent from libopenshot (if any)
-            socks = dict(poller.poll(1000))
-            if socks and socks.get(socket) == zmq.POLLIN:
-                msg = socket.recv(zmq.NOBLOCK)
-
-            if msg:
-                log.info(msg.strip().decode('UTF-8'))
+            try:
+                socks = dict(poller.poll(1000))
+                if socks and socks.get(self.socket) == zmq.POLLIN:
+                    msg = self.socket.recv(zmq.NOBLOCK)
+                if msg:
+                    log.info(msg.strip().decode('UTF-8'))
+            except Exception as ex:
+                log.warning(ex)