From cf8f0359c9334b88d599ba6d33cc42448eb6780b Mon Sep 17 00:00:00 2001
From: Tyson Smith <tyson.w.smith@gmail.com>
Date: Thu, 30 Mar 2023 12:50:48 -0700
Subject: [PATCH] [sapphire] Check and close connection in one place

---
 sapphire/worker.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/sapphire/worker.py b/sapphire/worker.py
index 121ddc32..913438ce 100644
--- a/sapphire/worker.py
+++ b/sapphire/worker.py
@@ -278,14 +278,12 @@ def launch(cls, listen_sock, job):
             pass
         except OSError as exc:
             LOG.debug("worker thread not launched: %s", exc)
-            if conn is not None:  # pragma: no cover
-                conn.close()
         except ThreadError:
-            if conn is not None:  # pragma: no cover
-                conn.close()
             # reset accepting status
             job.accepting.set()
             LOG.warning("ThreadError (worker), threads: %d", active_count())
             # wait for system resources to free up
             sleep(0.1)
+        if conn is not None:
+            conn.close()
         return None