Prevented connection pool from triggering a runtime exception when stream_select is interrupted by a signal.

Author: AndrewCarterUK

src/Connection/StreamSocketConnectionPool.php

@@ -59,27 +59,29 @@ public function operate(ConnectionHandlerFactoryInterface $connectionHandlerFact
         $read = array_merge(['pool' => $this->serverSocket], $this->clientSockets);
 
         if (false === @stream_select($read, $write, $except, $timeoutLoopSeconds, $timeoutLoopMicroseconds)) {
-            throw new \RuntimeException('stream_select failed');
-        }
+            $error = error_get_last();
 
-        foreach (array_keys($read) as $id) {
-            if ('pool' === $id) {
-                $this->acceptConnection($connectionHandlerFactory);
-            } else {
-                $this->connectionHandlers[$id]->ready();
+            if (false === stripos($error['message'], 'interrupted system call')) {
+                throw new \RuntimeException('stream_select failed: '.$error['message']);
+            }
+        } else {
+            foreach (array_keys($read) as $id) {
+                if ('pool' === $id) {
+                    $this->acceptConnection($connectionHandlerFactory);
+                } else {
+                    $this->connectionHandlers[$id]->ready();
+                }
             }
-        }
 
-        $this->removeConnections();
+            $this->removeConnections();
+        }
     }
 
     /**
      * {@inheritdoc}
      */
     public function shutdown()
     {
-        $this->acceptingNewConnections = false;
-
         foreach ($this->connectionHandlers as $connectionHandler) {
             $connectionHandler->shutdown();
         }
@@ -99,6 +101,8 @@ public function shutdown()
 
             $this->removeConnections();
         }
+
+        fclose($this->serverSocket);
     }
 
     /**

test/Connection/StreamSocketConnectionPoolTest.php

@@ -79,6 +79,30 @@ public function testStreamSelectFail()
         $connectionPool->operate($connectionHandlerFactory, 1);
     }
 
+    /**
+     * Test stream_select signal interrupt doesn't trigger \RunTime exception
+     */
+    public function testStreamSelectSignalInterrupt()
+    {
+        $address = 'tcp://localhost:7000';
+        $serverSocket = stream_socket_server($address);
+        $connectionPool = new StreamSocketConnectionPool($serverSocket);
+
+        $connectionHandlerFactory = new CallableConnectionHandlerFactory(function () {});
+
+        $alarmCalled = false;
+
+        pcntl_signal(SIGALRM, function () use (&$alarmCalled) {
+            $alarmCalled = true;
+        });
+
+        pcntl_alarm(1);
+
+        $connectionPool->operate($connectionHandlerFactory, 1);
+
+        $this->assertTrue($alarmCalled);
+    }
+
     /**
      * Test shutdown.
      */
@@ -94,13 +118,14 @@ public function testShutdown()
         $connection = new StreamSocketConnection($clientSocket);
         $connection->write('hello');
 
-        $shutdown = false;
+        $shutdownCalled   = false;
+        $readCalled = false;
 
-        $connectionHandlerCallback = function ($method, ConnectionInterface $connection) use (&$shutdown) {
+        $connectionHandlerCallback = function ($method, ConnectionInterface $connection) use (&$shutdownCalled, &$readCalled) {
             if ('shutdown' === $method) {
-                $shutdown = true;
+                $shutdownCalled = true;
             } elseif ('ready' === $method) {
-                // Do not close immediately, close on read
+                $readCalled = true;
                 $connection->close();
             }   
         };
@@ -112,6 +137,8 @@ public function testShutdown()
         // Shutdown connection pool
         $connectionPool->shutdown();
 
-        $this->assertTrue($shutdown);
+        // Make sure the handler cleaned up properly and got a chance to read the data
+        $this->assertTrue($shutdownCalled);
+        $this->assertTrue($readCalled);
     }
 }