better management of termination

Signed-off-by: Sylvain Hellegouarch <sh@defuze.org>

Author: Lawouach

CHANGELOG.md

@@ -2,7 +2,15 @@
 
 ## [Unreleased][]
 
-[Unreleased]: https://github.com/chaostoolkit/chaostoolkit-addons/compare/0.8.2...HEAD
+[Unreleased]: https://github.com/chaostoolkit/chaostoolkit-addons/compare/0.8.3...HEAD
+
+## [0.8.3][]
+
+[0.8.3]: https://github.com/chaostoolkit/chaostoolkit-addons/compare/0.8.2...0.8.3
+
+### Changed
+
+- Better management of ending the experiment
 
 ## [0.8.2][]
 

chaosaddons/controls/safeguards.py

@@ -200,12 +200,16 @@ def interrupt_now(self, triggered_by: str) -> None:
     def _wait_interruption(self) -> None:
         self.wait_for_interruption.wait()
 
+        # cannot interrupt if already finished
+        if experiment_finished.is_set():
+            return None
+
         if not self.triggered_by:
             return None
 
-        if not self.interrupted:
-            self.interrupted = True
-            if not experiment_finished.is_set():
+        with self._lock:
+            if not self._interrupted:
+                self._interrupted = True
                 logger.critical(
                     "Safeguard '{}' triggered the end of the experiment".format(
                         self.triggered_by))

setup.py

@@ -5,5 +5,5 @@
     setup(
         use_scm_version=True,
         name="chaostoolkit-addons",
-        version="0.8.1",
+        version="0.8.3",
     )