Addresses #332: pass config-file path for roadrunner (#335)

* Addresses #332: pass config-file path for roadrunner * style * check absolute path * foramtting Co-authored-by: Taylor Otwell <taylorotwell@gmail.com>
laravel · Jul 5, 2021 · a4e9602 · a4e9602
1 parent 7c56189
commit a4e9602
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/src/Commands/StartCommand.php b/src/Commands/StartCommand.php
@@ -21,6 +21,7 @@ class StartCommand extends Command implements SignalableCommandInterface
                     {--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}
+                    {--config= : The path to the RoadRunner .rr.yaml file}
                     {--watch : Automatically reload the server when the application is modified}';
 
     /**
@@ -76,6 +77,7 @@ protected function startRoadRunnerServer()
             '--rpc-port' => $this->option('rpc-port'),
             '--workers' => $this->option('workers'),
             '--max-requests' => $this->option('max-requests'),
+            '--config' => $this->option('config'),
             '--watch' => $this->option('watch'),
         ]);
     }

diff --git a/src/Commands/StartRoadRunnerCommand.php b/src/Commands/StartRoadRunnerCommand.php
@@ -3,6 +3,7 @@
 namespace Laravel\Octane\Commands;
 
 use Illuminate\Support\Str;
+use InvalidArgumentException;
 use Laravel\Octane\RoadRunner\ServerProcessInspector;
 use Laravel\Octane\RoadRunner\ServerStateFile;
 use Symfony\Component\Console\Command\SignalableCommandInterface;
@@ -26,6 +27,7 @@ class StartRoadRunnerCommand extends Command implements SignalableCommandInterfa
                     {--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}
+                    {--config= : The path to the RoadRunner .rr.yaml file}
                     {--watch : Automatically reload the server when the application is modified}';
 
     /**
@@ -69,13 +71,11 @@ public function handle(ServerProcessInspector $inspector, ServerStateFile $serve
 
         $this->writeServerStateFile($serverStateFile);
 
-        touch(base_path('.rr.yaml'));
-
         $this->forgetEnvironmentVariables();
 
         $server = tap(new Process(array_filter([
             $roadRunnerBinary,
-            '-c', base_path('.rr.yaml'),
+            '-c', $this->configPath(),
             '-o', 'http.address='.$this->option('host').':'.$this->option('port'),
             '-o', 'server.command='.(new PhpExecutableFinder)->find().' ./vendor/bin/roadrunner-worker',
             '-o', 'http.pool.num_workers='.$this->workerCount(),
@@ -132,6 +132,28 @@ protected function workerCount()
                             : $this->option('workers');
     }
 
+    /**
+     * Get the path to the RoadRunner configuration file.
+     *
+     * @return string
+     */
+    protected function configPath()
+    {
+        $path = $this->option('config');
+
+        if (! $path) {
+            touch(base_path('.rr.yaml'));
+
+            return base_path('.rr.yaml');
+        }
+
+        if ($path && ! realpath($path)) {
+            throw new InvalidArgumentException('Unable to locate specified configuration file.');
+        }
+
+        return realpath($path);
+    }
+
     /**
      * Get the maximum number of seconds that workers should be allowed to execute a single request.
      *