From b85d9eba50df20511d6dfd9b80c95c885a0f0908 Mon Sep 17 00:00:00 2001 From: jed Date: Thu, 7 Apr 2022 22:21:18 +0100 Subject: [PATCH 1/2] make the bin file used by swoole and roadrunner configurable options --- src/Commands/StartRoadRunnerCommand.php | 2 +- src/Commands/StartSwooleCommand.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Commands/StartRoadRunnerCommand.php b/src/Commands/StartRoadRunnerCommand.php index 1dceed75d..05b6642de 100644 --- a/src/Commands/StartRoadRunnerCommand.php +++ b/src/Commands/StartRoadRunnerCommand.php @@ -79,7 +79,7 @@ public function handle(ServerProcessInspector $inspector, ServerStateFile $serve '-c', $this->configPath(), '-o', 'version=2.7', '-o', 'http.address='.$this->option('host').':'.$this->option('port'), - '-o', 'server.command='.(new PhpExecutableFinder)->find().' '.base_path('vendor/bin/roadrunner-worker'), + '-o', 'server.command='.(new PhpExecutableFinder)->find().' '.base_path(config('octane.roadrunner.server.command', '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(), diff --git a/src/Commands/StartSwooleCommand.php b/src/Commands/StartSwooleCommand.php index f00233611..77d77b55b 100644 --- a/src/Commands/StartSwooleCommand.php +++ b/src/Commands/StartSwooleCommand.php @@ -78,7 +78,7 @@ public function handle( $this->forgetEnvironmentVariables(); $server = tap(new Process([ - (new PhpExecutableFinder)->find(), 'swoole-server', $serverStateFile->path(), + (new PhpExecutableFinder)->find(), config('octane.swoole.command', 'swoole-server'), $serverStateFile->path(), ], realpath(__DIR__.'/../../bin'), [ 'APP_ENV' => app()->environment(), 'APP_BASE_PATH' => base_path(), From ddcb6bc4af2104ed750f13f6e9ae9283069bf130 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 8 Apr 2022 14:20:55 -0500 Subject: [PATCH 2/2] Update StartRoadRunnerCommand.php --- src/Commands/StartRoadRunnerCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Commands/StartRoadRunnerCommand.php b/src/Commands/StartRoadRunnerCommand.php index 05b6642de..fcf3592c7 100644 --- a/src/Commands/StartRoadRunnerCommand.php +++ b/src/Commands/StartRoadRunnerCommand.php @@ -79,7 +79,7 @@ public function handle(ServerProcessInspector $inspector, ServerStateFile $serve '-c', $this->configPath(), '-o', 'version=2.7', '-o', 'http.address='.$this->option('host').':'.$this->option('port'), - '-o', 'server.command='.(new PhpExecutableFinder)->find().' '.base_path(config('octane.roadrunner.server.command', 'vendor/bin/roadrunner-worker')), + '-o', 'server.command='.(new PhpExecutableFinder)->find().' '.base_path(config('octane.roadrunner.command', '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(),