fix pipeline_manager call order

fkie-cad · Sep 13, 2024 · 9534a4c · 9534a4c
1 parent 61d35e9
commit 9534a4c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/logprep/framework/pipeline_manager.py b/logprep/framework/pipeline_manager.py
@@ -191,11 +191,10 @@ def stop(self):
 
     def restart(self, daemon=True):
         """Restarts all pipelines"""
+        if self.prometheus_exporter:
+            self.prometheus_exporter.run(daemon=daemon)
         self.set_count(0)
         self.set_count(self._configuration.process_count)
-        if not self.prometheus_exporter:
-            return
-        self.prometheus_exporter.run(daemon=daemon)
 
     def _create_pipeline(self, index) -> multiprocessing.Process:
         pipeline = Pipeline(pipeline_index=index, config=self._configuration)

diff --git a/tests/unit/framework/test_pipeline_manager.py b/tests/unit/framework/test_pipeline_manager.py
@@ -262,6 +262,15 @@ def test_restart_injects_healthcheck_functions(self):
         pipeline_manager.restart()
         pipeline_manager.prometheus_exporter.update_healthchecks.assert_called()
 
+    def test_restart_ensures_prometheus_exporter_is_running(self):
+        config = deepcopy(self.config)
+        config.metrics = MetricsConfig(enabled=True, port=666)
+        pipeline_manager = PipelineManager(config)
+        pipeline_manager.prometheus_exporter._prepare_multiprocessing = mock.MagicMock()
+        with mock.patch("logprep.util.http.ThreadingHTTPServer"):
+            pipeline_manager.restart()
+        pipeline_manager.prometheus_exporter.server.start.assert_called()
+
 
 class TestThrottlingQueue: