stop config reloading through stop event

MEPalma · MEPalma · commit 6d3d796b42a9 · 2024-11-18T16:38:23.000+01:00
diff --git a/localstack-core/localstack/services/lambda_/provider.py b/localstack-core/localstack/services/lambda_/provider.py
@@ -383,6 +383,15 @@ def on_after_init(self):
     def on_before_stop(self) -> None:
         # TODO: should probably unregister routes?
         self.lambda_service.stop()
+        # Attempt to signal to the Lambda Debug Mode session object to stop.
+        try:
+            lambda_debug_mode_session = LambdaDebugModeSession.get()
+            lambda_debug_mode_session.signal_stop()
+        except Exception as ex:
+            LOG.error(
+                "Unexpected error encountered when attempting to signal Lambda Debug Mode to stop '%s'.",
+                ex,
+            )
 
     @staticmethod
     def _get_function(function_name: str, account_id: str, region: str) -> Function:
diff --git a/localstack-core/localstack/utils/lambda_debug_mode/lambda_debug_mode_session.py b/localstack-core/localstack/utils/lambda_debug_mode/lambda_debug_mode_session.py
@@ -8,7 +8,6 @@
 
 from localstack.aws.api.lambda_ import Arn
 from localstack.config import LAMBDA_DEBUG_MODE, LAMBDA_DEBUG_MODE_CONFIG_PATH
-from localstack.services.plugins import SERVICE_PLUGINS
 from localstack.utils.lambda_debug_mode.lambda_debug_mode_config import (
     LambdaDebugConfig,
     LambdaDebugModeConfig,
@@ -25,6 +24,7 @@ class LambdaDebugModeSession:
     _configuration_file_path: Optional[str]
     _watch_thread: Optional[Thread]
     _initialised_event: Optional[Event]
+    _stop_event: Optional[Event]
     _config: Optional[LambdaDebugModeConfig]
 
     def __init__(self):
@@ -34,6 +34,7 @@ def __init__(self):
         self._configuration_file_path = None
         self._watch_thread = None
         self._initialised_event = None
+        self._stop_event = None
         self._config = None
 
         # Lambda Debug Mode is not enabled: leave as disabled state and return.
@@ -56,6 +57,9 @@ def __init__(self):
         # occur with no Debug configuration.
         self._initialised_event = Event()
 
+        # Signals when a shutdown signal from the application is registered.
+        self._stop_event = Event()
+
         self._watch_thread = Thread(
             target=self._watch_logic, args=(), daemon=True, name="LambdaDebugModeConfigWatch"
         )
@@ -88,6 +92,11 @@ def ensure_running(self) -> None:
                 exception_str,
             )
 
+    def signal_stop(self) -> None:
+        stop_event = self._stop_event
+        if stop_event is not None:
+            stop_event.set()
+
     def _load_lambda_debug_mode_config(self):
         yaml_configuration_string = None
         try:
@@ -145,8 +154,8 @@ def _watch_logic(self) -> None:
         self._load_lambda_debug_mode_config()
         self._initialised_event.set()
 
-        # Monitor for file changes whilst the lambda service is running.
-        while SERVICE_PLUGINS.is_running("lambda"):
+        # Monitor for file changes whilst the application is running.
+        while not self._stop_event.is_set():
             time.sleep(1)
             epoch_last_modified = self._config_file_epoch_last_modified_or_now()
             if epoch_last_modified > epoch_last_loaded:
