squidient 2.2.0__tar.gz → 2.3.0__tar.gz

{squidient-2.2.0 → squidient-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: squidient
-Version: 2.2.0
+Version: 2.3.0
 Summary: CI/CD framework for alya
 Project-URL: Homepage, https://alya.gitlab.bsc.es/alya/ci-cd/squidient
 Project-URL: Bug Tracker, https://alya.gitlab.bsc.es/alya/ci-cd/squidient/issues

{squidient-2.2.0 → squidient-2.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "squidient"
-version = "2.2.0"
+version = "2.3.0"
 authors = [
   { name="Damien Dosimont", email="damien.dosimont@gmail.com" },
 ]

{squidient-2.2.0 → squidient-2.3.0}/src/squidient/squidient.py

@@ -32,21 +32,26 @@ from .terraform.terraform import *
 from .timers import Timer
 
 
-class IgnoredKeyboardInterrupt(object):
+class IgnoredInterrupts(object):
+    """Ignore repeated interrupt signals while cleanup is running."""
 
     def __enter__(self):
-        self.signal_received = False
-        self.old_handler = signal.signal(signal.SIGINT, self.handler)
+        self._old_handlers = {}
+        for sig in [signal.SIGINT, signal.SIGTERM]:
+            self._old_handlers[sig] = signal.signal(sig, self.handler)
 
     def handler(self, sig, frame):
-        # self.signal_received = (sig, frame)
-        logging.debug('SIGINT received. Delaying KeyboardInterrupt.')
+        logging.debug('Interrupt signal received. Delaying KeyboardInterrupt.')
 
     def __exit__(self, type, value, traceback):
-        # signal.signal(signal.SIGINT, self.old_handler)
-        # if self.signal_received:
-        #     self.old_handler(*self.signal_received)
-        logging.debug('Exiting from SIGINT handler.')
+        logging.debug('Exiting from interrupt signal handler.')
+
+
+IgnoredKeyboardInterrupt = IgnoredInterrupts
+
+
+def install_interrupt_handlers():
+    signal.signal(signal.SIGTERM, signal.default_int_handler)
 
 
 def additional_options():
@@ -239,6 +244,7 @@ def main(argv: Optional[Sequence[str]] = None) -> int:
     """
     if argv is None:
         argv = sys.argv[1:]
+    install_interrupt_handlers()
     return _run_cli(argv)
 
 

{squidient-2.2.0 → squidient-2.3.0}/src/squidient/squidientmonitor.py

@@ -25,7 +25,7 @@ from typing import Optional, Sequence
 
 from .utils.arguments import Arguments
 from .monitor.monitor import *
-from .squidient import IgnoredKeyboardInterrupt, darwin_bad_ssh, additional_options
+from .squidient import IgnoredKeyboardInterrupt, darwin_bad_ssh, additional_options, install_interrupt_handlers
 from .connection.sshconfigchecker import test_darwin_ssh_config, darwin_ssh_config_file
 
 
@@ -162,6 +162,7 @@ def main(argv: Optional[Sequence[str]] = None) -> int:
     """
     if argv is None:
         argv = sys.argv[1:]
+    install_interrupt_handlers()
     return _run_cli(argv)
 
 if __name__ == "__main__":

squidient-2.2.0/.ci-cd/python-ci/README.md

@@ -1,2 +0,0 @@
-# python-ci
-