Improved handling of internal errors on userland daemon

PHPFastCGI · Sep 23, 2015 · 510eb1f · 510eb1f
1 parent 01ec237
commit 510eb1f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/src/Driver/Userland/UserlandDaemon.php b/src/Driver/Userland/UserlandDaemon.php
@@ -7,6 +7,7 @@
 use PHPFastCGI\FastCGIDaemon\DaemonTrait;
 use PHPFastCGI\FastCGIDaemon\Driver\Userland\Connection\ConnectionPoolInterface;
 use PHPFastCGI\FastCGIDaemon\Driver\Userland\ConnectionHandler\ConnectionHandlerFactoryInterface;
+use PHPFastCGI\FastCGIDaemon\Driver\Userland\Exception\UserlandDaemonException;
 use PHPFastCGI\FastCGIDaemon\Exception\ShutdownException;
 use PHPFastCGI\FastCGIDaemon\KernelInterface;
 
@@ -101,8 +102,12 @@ private function processConnectionPool()
                 $this->connectionHandlers[$id] = $this->connectionHandlerFactory->createConnectionHandler($this->kernel, $connection);
             }
 
-            $dispatchedRequests = $this->connectionHandlers[$id]->ready();
-            $this->incrementRequestCount($dispatchedRequests);
+            try {
+                $dispatchedRequests = $this->connectionHandlers[$id]->ready();
+                $this->incrementRequestCount($dispatchedRequests);
+            } catch (UserlandDaemonException $exception) {
+                $this->daemonOptions->getOption(DaemonOptions::LOGGER)->error($exception->getMessage());
+            }
 
             if ($this->connectionHandlers[$id]->isClosed()) {
                 unset($this->connectionHandlers[$id]);

diff --git a/test/Driver/Userland/UserlandDaemonTest.php b/test/Driver/Userland/UserlandDaemonTest.php
@@ -5,6 +5,7 @@
 use PHPFastCGI\FastCGIDaemon\DaemonOptions;
 use PHPFastCGI\FastCGIDaemon\Driver\Userland\Connection\StreamSocketConnectionPool;
 use PHPFastCGI\FastCGIDaemon\Driver\Userland\ConnectionHandler\ConnectionHandlerFactory;
+use PHPFastCGI\FastCGIDaemon\Driver\Userland\Exception\UserlandDaemonException;
 use PHPFastCGI\FastCGIDaemon\Driver\Userland\UserlandDaemon;
 use PHPFastCGI\FastCGIDaemon\Http\RequestInterface;
 use PHPFastCGI\Test\FastCGIDaemon\Helper\Client\ConnectionWrapper;
@@ -89,6 +90,27 @@ public function testException()
         $this->assertContains('boo', $context['logger']->getMessages()[0]['message']);
     }
 
+    /**
+     * Tests that the daemon cleanly handles internal exceptions (such as
+     * protocol and connection exceptions).
+     */
+    public function testDaemonException()
+    {
+        $context = $this->createTestingContext();
+
+        $socket1            = stream_socket_client($context['address']);
+        $connectionWrapper1 = new ConnectionWrapper($socket1);
+        $connectionWrapper1->writeRequest(1, ['DAEMON_EXCEPTION' => 'boo'], '');
+
+        $socket2            = stream_socket_client($context['address']);
+        $connectionWrapper2 = new ConnectionWrapper($socket2);
+        $connectionWrapper2->writeRequest(2, ['SHUTDOWN' => true], '');
+
+        $context['daemon']->run();
+
+        $this->assertContains('boo',  $context['logger']->getMessages()[0]['message']);
+    }
+
     /**
      * Tests that the daemon shuts down after receiving a SIGINT.
      */
@@ -115,6 +137,8 @@ private function createTestingContext($requestLimit = DaemonOptions::NO_LIMIT, $
 
                     if (isset($params['EXCEPTION'])) {
                         throw new \Exception($params['EXCEPTION']);
+                    } elseif (isset($params['DAEMON_EXCEPTION'])) {
+                        throw new UserlandDaemonException($params['DAEMON_EXCEPTION']);
                     } elseif (isset($params['SHUTDOWN'])) {
                         posix_kill(posix_getpid(), SIGINT);
                     }