Fix shutdown plugin on timeout

beer-garden · Aug 19, 2024 · 9e5a394 · 9e5a394
1 parent de33d39
commit 9e5a394
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/brewtils/plugin.py b/brewtils/plugin.py
@@ -264,20 +264,21 @@ def run(self):
         try:
             self._startup()
             self._logger.info("Plugin %s has started", self.unique_name)
+
+            try:
+                # Need the timeout param so this works correctly in Python 2
+                while not self._shutdown_event.wait(timeout=0.1):
+                    pass
+            except KeyboardInterrupt:
+                self._logger.debug("Received KeyboardInterrupt - shutting down")
+            except Exception as ex:
+                self._logger.exception("Exception during wait, shutting down: %s", ex)
+
+            self._shutdown()
         except PluginValidationError:
             self._shutdown(status="ERROR")
-
-        try:
-            # Need the timeout param so this works correctly in Python 2
-            while not self._shutdown_event.wait(timeout=0.1):
-                pass
-        except KeyboardInterrupt:
-            self._logger.debug("Received KeyboardInterrupt - shutting down")
-        except Exception as ex:
-            self._logger.exception("Exception during wait, shutting down: %s", ex)
-
-        self._shutdown()
-        self._logger.info("Plugin %s has terminated", self.unique_name)
+        finally:
+            self._logger.info("Plugin %s has terminated", self.unique_name)
 
     @property
     def client(self):