Add retry connection mechanism for Nginx - PHP-FPM as well

Signed-off-by: Alexandre Rulleau <[email protected]>

Author: Leiyks

tests/Nginx/NginxServer.php

@@ -24,6 +24,16 @@ final class NginxServer
      */
     private $rootPath;
 
+    /**
+     * @var string
+     */
+    private $serverHost;
+
+    /**
+     * @var int
+     */
+    private $hostPort;
+
     /**
      * @param string $indexFile
      * @param string $serverHost
@@ -35,6 +45,8 @@ final class NginxServer
     public function __construct($indexFile, $serverHost, $hostPort, $fastCGIHost, $fastCGIPort)
     {
         $this->rootPath = dirname($indexFile);
+        $this->serverHost = $serverHost;
+        $this->hostPort = $hostPort;
         $replacements = [
             '{{root_path}}' => $this->rootPath,
             '{{index_file}}' => basename($indexFile),
@@ -76,6 +88,27 @@ public function start()
 
         $this->process = new Process($processCmd);
         $this->process->start();
+
+        if (!$this->waitUntilServerRunning()) {
+            error_log("[nginx] Server never came up...");
+            return;
+        }
+        error_log("[nginx] Server is up and responding...");
+    }
+
+    public function waitUntilServerRunning()
+    {
+        //Let's wait until nginx is accepting connections
+        for ($try = 0; $try < 40; $try++) {
+            $socket = @fsockopen($this->serverHost, $this->hostPort);
+            if ($socket !== false) {
+                fclose($socket);
+                return true;
+            }
+            usleep(50000);
+        }
+
+        return false;
     }
 
     public function stop()

tests/Sapi/PhpFpm/PhpFpm.php

@@ -34,6 +34,16 @@ final class PhpFpm implements Sapi
      */
     private $logFile;
 
+    /**
+     * @var string
+     */
+    private $host;
+
+    /**
+     * @var int
+     */
+    private $port;
+
     /**
      * @param string $rootPath
      * @param string $host
@@ -45,6 +55,8 @@ public function __construct($rootPath, $host, $port, array $envs = [], array $in
     {
         $this->envs = $envs;
         $this->inis = $inis;
+        $this->host = $host;
+        $this->port = $port;
 
         $logPath = $rootPath . '/' . self::ERROR_LOG;
 
@@ -88,6 +100,27 @@ public function start()
 
         $this->process = new Process($processCmd);
         $this->process->start();
+
+        if (!$this->waitUntilServerRunning()) {
+            error_log("[php-fpm] Server never came up...");
+            return;
+        }
+        error_log("[php-fpm] Server is up and responding...");
+    }
+
+    public function waitUntilServerRunning()
+    {
+        //Let's wait until PHP-FPM is accepting connections
+        for ($try = 0; $try < 40; $try++) {
+            $socket = @fsockopen($this->host, $this->port);
+            if ($socket !== false) {
+                fclose($socket);
+                return true;
+            }
+            usleep(50000);
+        }
+
+        return false;
     }
 
     public function stop()

tests/WebServer.php

@@ -224,6 +224,10 @@ public function start()
             }
         }
 
+        // Start PHP-FPM first (if FastCGI), as nginx depends on it
+        $this->sapi->start();
+
+        // Then start nginx (if needed)
         if ($this->sapi->isFastCgi()) {
             $this->server = new NginxServer(
                 $this->indexFile,
@@ -234,9 +238,6 @@ public function start()
             );
             $this->server->start();
         }
-
-        $this->sapi->start();
-        usleep(500000);
     }
 
     public function reload()