[amqp] Add test for SignalSocketHelper.

makasim · makasim · commit 4f480716a833 · 2018-01-09T18:20:39.000+02:00
diff --git a/pkg/amqp-tools/SignalSocketHelper.php b/pkg/amqp-tools/SignalSocketHelper.php
@@ -14,6 +14,11 @@ class SignalSocketHelper
      */
     private $wasThereSignal;
 
+    /**
+     * @var int[]
+     */
+    private $signals = [SIGTERM, SIGQUIT, SIGINT];
+
     public function __construct()
     {
         $this->handlers = [];
@@ -25,30 +30,33 @@ public function beforeSocket()
             throw new \LogicException('The handlers property should be empty but it is not. The afterSocket method might not have been called.');
         }
         if (null !== $this->wasThereSignal) {
-            throw new \LogicException('The wasSignal property should be null but it is not. The afterSocket method might not have been called.');
+            throw new \LogicException('The wasThereSignal property should be null but it is not. The afterSocket method might not have been called.');
         }
 
         $this->wasThereSignal = false;
 
-        foreach ([SIGTERM, SIGQUIT, SIGINT] as $signal) {
+        foreach ($this->signals as $signal) {
             /** @var callable $handler */
-            if ($handler = pcntl_signal_get_handler(SIGTERM)) {
-                pcntl_signal($signal, function ($signal) use ($handler) {
-                    $this->wasThereSignal = true;
+            $handler = pcntl_signal_get_handler($signal);
 
-                    $handler($signal);
-                });
+            pcntl_signal($signal, function ($signal) use ($handler) {
+                var_dump('fuckk!');
+                $this->wasThereSignal = true;
 
-                $this->handlers[$signal] = $handler;
-            }
+                $handler && $handler($signal);
+            });
+
+            $handler && $this->handlers[$signal] = $handler;
         }
     }
 
     public function afterSocket()
     {
         $this->wasThereSignal = null;
 
-        foreach ($this->handlers as $signal => $handler) {
+        foreach ($this->signals as $signal) {
+            $handler = isset($this->handlers[$signal]) ? $this->handlers[$signal] : SIG_DFL;
+
             pcntl_signal($signal, $handler);
         }
 
diff --git a/pkg/enqueue/Consumption/Extension/SignalExtension.php b/pkg/enqueue/Consumption/Extension/SignalExtension.php
@@ -31,7 +31,9 @@ public function onStart(Context $context)
             throw new LogicException('The pcntl extension is required in order to catch signals.');
         }
 
-        pcntl_async_signals(true);
+        if (function_exists('pcntl_async_signals')) {
+            pcntl_async_signals(true);
+        }
 
         pcntl_signal(SIGTERM, [$this, 'handleSignal']);
         pcntl_signal(SIGQUIT, [$this, 'handleSignal']);
@@ -47,7 +49,7 @@ public function onBeforeReceive(Context $context)
     {
         $this->logger = $context->getLogger();
 
-        pcntl_signal_dispatch();
+        $this->dispatchSignal();
 
         $this->interruptExecutionIfNeeded($context);
     }
@@ -65,7 +67,7 @@ public function onPreReceived(Context $context)
      */
     public function onPostReceived(Context $context)
     {
-        pcntl_signal_dispatch();
+        $this->dispatchSignal();
 
         $this->interruptExecutionIfNeeded($context);
     }
@@ -75,7 +77,7 @@ public function onPostReceived(Context $context)
      */
     public function onIdle(Context $context)
     {
-        pcntl_signal_dispatch();
+        $this->dispatchSignal();
 
         $this->interruptExecutionIfNeeded($context);
     }
@@ -119,4 +121,11 @@ public function handleSignal($signal)
                 break;
         }
     }
+
+    private function dispatchSignal()
+    {
+        if (false == function_exists('pcntl_async_signals')) {
+            pcntl_signal_dispatch();
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,9 @@ public function onStart(Context $context)`
`31`	`31`	`throw new LogicException('The pcntl extension is required in order to catch signals.');`
`32`	`32`	`}`
`33`	`33`
`34`		`- pcntl_async_signals(true);`
	`34`	`+ if (function_exists('pcntl_async_signals')) {`
	`35`	`+ pcntl_async_signals(true);`
	`36`	`+ }`
`35`	`37`
`36`	`38`	`pcntl_signal(SIGTERM, [$this, 'handleSignal']);`
`37`	`39`	`pcntl_signal(SIGQUIT, [$this, 'handleSignal']);`
`@@ -47,7 +49,7 @@ public function onBeforeReceive(Context $context)`
`47`	`49`	`{`
`48`	`50`	`$this->logger = $context->getLogger();`
`49`	`51`
`50`		`- pcntl_signal_dispatch();`
	`52`	`+ $this->dispatchSignal();`
`51`	`53`
`52`	`54`	`$this->interruptExecutionIfNeeded($context);`
`53`	`55`	`}`
`@@ -65,7 +67,7 @@ public function onPreReceived(Context $context)`
`65`	`67`	`*/`
`66`	`68`	`public function onPostReceived(Context $context)`
`67`	`69`	`{`
`68`		`- pcntl_signal_dispatch();`
	`70`	`+ $this->dispatchSignal();`
`69`	`71`
`70`	`72`	`$this->interruptExecutionIfNeeded($context);`
`71`	`73`	`}`
`@@ -75,7 +77,7 @@ public function onPostReceived(Context $context)`
`75`	`77`	`*/`
`76`	`78`	`public function onIdle(Context $context)`
`77`	`79`	`{`
`78`		`- pcntl_signal_dispatch();`
	`80`	`+ $this->dispatchSignal();`
`79`	`81`
`80`	`82`	`$this->interruptExecutionIfNeeded($context);`
`81`	`83`	`}`
`@@ -119,4 +121,11 @@ public function handleSignal($signal)`
`119`	`121`	`break;`
`120`	`122`	`}`
`121`	`123`	`}`
	`124`	`+`
	`125`	`+ private function dispatchSignal()`
	`126`	`+ {`
	`127`	`+ if (false == function_exists('pcntl_async_signals')) {`
	`128`	`+ pcntl_signal_dispatch();`
	`129`	`+ }`
	`130`	`+ }`
`122`	`131`	`}`