Merge pull request #361 from spiderxm/fix-network-capture

fix - kill network capture process if any container is killed
OWASP · Sep 17, 2022 · 4bf399f · 4bf399f
2 parents 96ff6ea + b38ed0f
commit 4bf399f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/core/load.py b/core/load.py
@@ -362,13 +362,17 @@ def wait_until_interrupt(virtual_machine_container_reset_factory_time_seconds, c
                 # start containers based on selected modules
                 start_containers(configuration)
             if not new_network_events_thread.is_alive():
-                return error(messages["interrupt_application"])
+                error(messages["interrupt_application"])
+                new_network_events_thread.terminate()
+                break
             if containers_are_unhealthy(configuration):
-                return error(
+                error(
                     "Interrupting the application because \"{0}\" container(s) is(are) not alive!".format(
                         ", ".join(containers_are_unhealthy(configuration))
                     )
                 )
+                new_network_events_thread.terminate()
+                break
             if run_as_test:
                 break
         except KeyboardInterrupt: