feat: Disable thread joining on transport shutdown if timeout is 0 (#58)

Author: mitsuhiko

sentry_sdk/transport.py

@@ -135,7 +135,10 @@ def capture_event(self, event):
 
     def shutdown(self, timeout, callback=None):
         logger.debug("Shutting down HTTP transport orderly")
-        self._worker.shutdown(timeout, callback)
+        if timeout <= 0:
+            self._worker.kill()
+        else:
+            self._worker.shutdown(timeout, callback)
 
     def kill(self):
         logger.debug("Killing HTTP transport")

sentry_sdk/worker.py

@@ -62,19 +62,23 @@ def kill(self):
     def shutdown(self, timeout, callback=None):
         logger.debug("background worker got shutdown request")
         with self._lock:
-            if not self.is_alive:
-                return
-            self._queue.put_nowait(_TERMINATOR)
-            initial_timeout = min(0.1, timeout)
-            if not self._timed_queue_join(initial_timeout):
-                pending = self._queue.qsize()
-                logger.debug("%d event(s) pending on shutdown", pending)
-                if callback is not None:
-                    callback(pending, timeout)
-                self._timed_queue_join(timeout - initial_timeout)
+            if self.is_alive:
+                self._queue.put_nowait(_TERMINATOR)
+                if timeout > 0.0:
+                    self._wait_shutdown(timeout, callback)
             self._thread = None
+            self._thread_for_pid = None
         logger.debug("background worker shut down")
 
+    def _wait_shutdown(self, timeout, callback):
+        initial_timeout = min(0.1, timeout)
+        if not self._timed_queue_join(initial_timeout):
+            pending = self._queue.qsize()
+            logger.debug("%d event(s) pending on shutdown", pending)
+            if callback is not None:
+                callback(pending, timeout)
+            self._timed_queue_join(timeout - initial_timeout)
+
     def submit(self, callback):
         self._ensure_thread()
         self._queue.put_nowait(callback)