Fix thread shutdown

- Make sure all Python threads have the daemon=True attribute
- Remove thread-reaping from main_window.closeEvent(), now automatic

Author: ferdnyc

src/classes/logger_libopenshot.py

@@ -34,6 +34,9 @@
 
 
 class LoggerLibOpenShot(Thread):
+    def __init__(self):
+        super().__init__()
+        self.daemon = True
 
     def kill(self):
         self.running = False
@@ -80,4 +83,4 @@ def run(self):
 
             # Log the message (if any)
             if msg:
-                log.info(msg.strip().decode('UTF-8'))
+                log.info(msg.strip().decode('UTF-8'))

src/classes/metrics.py

@@ -99,6 +99,7 @@ def track_metric_screen(screen_name):
     metric_params["cid"] = s.get("unique_install_id")
 
     t = threading.Thread(target=send_metric, args=[metric_params])
+    t.daemon = True
     t.start()
 
 
@@ -113,6 +114,7 @@ def track_metric_event(event_action, event_label, event_category="General", even
     metric_params["cid"] = s.get("unique_install_id")
 
     t = threading.Thread(target=send_metric, args=[metric_params])
+    t.daemon = True
     t.start()
 
 
@@ -126,12 +128,14 @@ def track_metric_error(error_name, is_fatal=False):
         metric_params["exf"] = 1
 
     t = threading.Thread(target=send_metric, args=[metric_params])
+    t.daemon = True
     t.start()
 
 
 def track_exception_stacktrace(stacktrace, source):
     """Track an exception/stacktrace has occurred"""
     t = threading.Thread(target=send_exception, args=[stacktrace, source])
+    t.daemon = True
     t.start()
 
 
@@ -147,6 +151,7 @@ def track_metric_session(is_start=True):
         metric_params["cd"] = "close-app"
 
     t = threading.Thread(target=send_metric, args=[metric_params])
+    t.daemon = True
     t.start()
 
 

src/classes/thumbnail.py

@@ -106,10 +106,12 @@ def run(self):
         # Start listening for HTTP requests (and check for shutdown every 0.5 seconds)
         self.server_address = ('127.0.0.1', self.find_free_port())
         self.thumbServer = httpThumbnailServer(self.server_address, httpThumbnailHandler)
+        self.thumbSever.daemon_threads = True
         self.thumbServer.serve_forever(0.5)
 
     def __init__(self):
         Thread.__init__(self)
+        self.daemon = True
         self.server_address = None
 
 

src/classes/version.py

@@ -35,6 +35,7 @@
 def get_current_Version():
     """Get the current version """
     t = threading.Thread(target=get_version_from_http)
+    t.daemon = True
     t.start()
 
 def get_version_from_http():

src/classes/waveform.py

@@ -49,6 +49,7 @@ def get_audio_data(clip_id, file_path, channel_filter, volume_keyframe):
 
     log.info("Clip loaded, start thread")
     t = threading.Thread(target=get_waveform_thread, args=[clip, clip_id, file_path, channel_filter, volume_keyframe])
+    t.daemon = True
     t.start()
 
 def get_waveform_thread(clip, clip_id, file_path, channel_filter=-1, volume_keyframe=None):

src/windows/animated_title.py

@@ -31,7 +31,6 @@
 import time
 import uuid
 import shutil
-import threading
 import subprocess
 import re
 import math

src/windows/main_window.py

@@ -156,18 +156,10 @@ def closeEvent(self, event):
         self.preview_parent.background.exit()
         self.preview_parent.background.wait(5000)
 
-        # Shut down the webview
-        self.timeline.close()
-
         # Close Timeline
         self.timeline_sync.timeline.Close()
         self.timeline_sync.timeline = None
 
-        # Close & Stop libopenshot logger
-        openshot.ZmqLogger.Instance().Close()
-        app.logger_libopenshot.kill()
-        self.http_server_thread.kill()
-
         # Destroy lock file
         self.destroy_lock_file()