From bb25a19d8c85290b6c413580523b2e7f26c625d6 Mon Sep 17 00:00:00 2001
From: Bruno Domingues <bruno.domingues@aignosi.com.br>
Date: Thu, 30 Oct 2025 15:14:43 -0300
Subject: [PATCH] SIENTIAPDE-1241: Simplify worker shutdown logic by removing
 conditional checks.

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

diff --git a/model_manager/worker/worker.py b/model_manager/worker/worker.py
index ed553a4..cb96773 100644
--- a/model_manager/worker/worker.py
+++ b/model_manager/worker/worker.py
@@ -152,10 +152,8 @@ async def main():
     except BaseException as e:  # noqa: BLE001
         logger.custom_error(f'An unhandled exception occurred: {e}', metadata)
     finally:
-        if notification_handler:
-            notification_handler.shutdown()
-        if activities:
-            await activities.shutdown()
+        notification_handler.shutdown()
+        await activities.shutdown()
         # Exit with a non-zero status code to indicate failure to Kubernetes
         metrics.APP_UP.labels(pod_id=POD_ID).set(0)  # Mark app as DOWN
         sys.exit(1)