Fixes RR reload by setting a different RPC port (#216)

Author: nunomaduro

src/Commands/StartCommand.php

@@ -17,6 +17,7 @@ class StartCommand extends Command implements SignalableCommandInterface
                     {--server= : The server that should be used to serve the application}
                     {--host=127.0.0.1 : The IP address the server should bind to}
                     {--port=8000 : The port the server should be available on}
+                    {--rpc-port= : The RPC port the server should be available on}
                     {--workers=auto : The number of workers that should be available to handle requests}
                     {--task-workers=auto : The number of task workers that should be available to handle tasks}
                     {--max-requests=500 : The number of requests to process before reloading the server}
@@ -79,6 +80,7 @@ protected function startRoadRunnerServer()
         return $this->call('octane:roadrunner', [
             '--host' => $this->option('host'),
             '--port' => $this->option('port'),
+            '--rpc-port' => $this->option('rpc-port'),
             '--workers' => $this->option('workers'),
             '--max-requests' => $this->option('max-requests'),
             '--watch' => $this->option('watch'),

src/Commands/StartRoadRunnerCommand.php

@@ -21,6 +21,7 @@ class StartRoadRunnerCommand extends Command implements SignalableCommandInterfa
     public $signature = 'octane:roadrunner
                     {--host=127.0.0.1 : The IP address the server should bind to}
                     {--port=8000 : The port the server should be available on}
+                    {--rpc-port= : The RPC port the server should be available on}
                     {--workers=auto : The number of workers that should be available to handle requests}
                     {--max-requests=500 : The number of requests to process before reloading the server}
                     {--watch : Automatically reload the server when the application is modified}';
@@ -73,6 +74,7 @@ public function handle(ServerProcessInspector $inspector, ServerStateFile $serve
             '-o', 'server.command='.(new PhpExecutableFinder)->find().' ./vendor/bin/roadrunner-worker',
             '-o', 'http.pool.num_workers='.$this->workerCount(),
             '-o', 'http.pool.max_jobs='.$this->option('max-requests'),
+            '-o', 'rpc.listen=tcp://'.$this->option('host').':'.$this->rpcPort(),
             '-o', 'http.pool.supervisor.exec_ttl='.$this->maxExecutionTime(),
             '-o', 'http.static.dir=public',
             '-o', 'http.middleware=static',
@@ -101,6 +103,7 @@ protected function writeServerStateFile(
             'appName' => config('app.name', 'Laravel'),
             'host' => $this->option('host'),
             'port' => $this->option('port'),
+            'rpcPort' => $this->rpcPort(),
             'workers' => $this->workerCount(),
             'maxRequests' => $this->option('max-requests'),
             'octaneConfig' => config('octane'),
@@ -129,6 +132,16 @@ protected function maxExecutionTime()
         return config('octane.max_execution_time', '30').'s';
     }
 
+    /**
+     * Get the RPC port the server should be available on.
+     *
+     * @return int
+     */
+    protected function rpcPort()
+    {
+        return $this->option('rpc-port') ?: $this->option('port') - 1999;
+    }
+
     /**
      * Write the server process output to the console.
      *

src/RoadRunner/ServerProcessInspector.php

@@ -37,10 +37,18 @@ public function serverIsRunning(): bool
      */
     public function reloadServer(): void
     {
-        tap($this->processFactory->createProcess(
-            ['./rr', 'reset'],
-            base_path()
-        ))->start()->waitUntil(function ($type, $buffer) {
+        [
+            'state' => [
+                'host' => $host,
+                'rpcPort' => $rpcPort,
+            ],
+        ] = $this->serverStateFile->read();
+
+        tap($this->processFactory->createProcess([
+            './rr',
+            'reset',
+            '-o', "rpc.listen=tcp://$host:$rpcPort",
+        ], base_path()))->start()->waitUntil(function ($type, $buffer) {
             if ($type === Process::ERR) {
                 throw new RuntimeException('Cannot reload RoadRunner: '.$buffer);
             }

tests/RoadRunnerServerProcessInspectorTest.php

@@ -55,8 +55,13 @@ public function test_roadrunner_server_process_can_be_reloaded()
             new PosixExtension
         );
 
+        $processIdFile->writeState([
+            'host' => '127.0.0.1',
+            'rpcPort' => '6002',
+        ]);
+
         $processFactory->shouldReceive('createProcess')->with(
-            ['./rr', 'reset'],
+            ['./rr', 'reset', '-o', 'rpc.listen=tcp://127.0.0.1:6002'],
             base_path(),
         )->andReturn($process = Mockery::mock('stdClass'));