Merge lp:~cjwatson/rabbitfixture/less-aggressive-sigterm into lp:rabbitfixture

[Colin Watson]

Only send SIGTERM once while stopping RabbitServerRunner.

It's sent to the whole process group, and that can itself interfere with the shutdown process if we send it frequently and repeatedly. I noticed that Launchpad's `RabbitMQLayer` was oddly slow to shut down sometimes, and tracked that down to this.

[Andrey Fedoseev (andrey-fedoseev)]

review: Approve

=== modified file 'NEWS.rst'
--- NEWS.rst	2022-07-22 22:25:15 +0000
+++ NEWS.rst	2022-09-01 00:03:38 +0000
@@ -2,6 +2,13 @@
 NEWS for rabbitfixture
 ======================
 
+0.5.2
+=====
+
+- Only send ``SIGTERM`` once while stopping ``RabbitServerRunner``, since
+  it's sent to the whole process group and that can itself interfere with
+  the shutdown process if we send it frequently and repeatedly.
+
 0.5.1 (2022-07-22)
 ==================
 

=== modified file 'rabbitfixture/server.py'
--- rabbitfixture/server.py	2022-07-22 19:41:42 +0000
+++ rabbitfixture/server.py	2022-09-01 00:03:38 +0000
@@ -452,10 +452,10 @@
 
             # Wait for the process to end...
             timeout = max(timeout, time.time() + self.environment.ctltimeout)
+            self._signal(signal.SIGTERM)
             while time.time() < timeout:
                 if not self.is_running():
                     break
-                self._signal(signal.SIGTERM)
                 time.sleep(0.1)
             else:
                 # Die!!!