Merge pull request #743 from laravel/feat/herd-support

[2.x] Adds Herd support
laravel · Oct 6, 2023 · fc0a649 · fc0a649
2 parents 75f8d9d + 54fd740
commit fc0a649
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/Commands/Concerns/InstallsRoadRunnerDependencies.php b/src/Commands/Concerns/InstallsRoadRunnerDependencies.php
@@ -21,7 +21,7 @@ trait InstallsRoadRunnerDependencies
      *
      * @var string
      */
-    protected $requiredVersion = '2023.1.1';
+    protected $requiredVersion = '2023.3.0';
 
     /**
      * Determine if RoadRunner is installed.

diff --git a/src/Commands/Concerns/InteractsWithIO.php b/src/Commands/Concerns/InteractsWithIO.php
@@ -22,6 +22,7 @@ trait InteractsWithIO
      */
     protected $ignoreMessages = [
         'destroy signal received',
+        'req-resp mode',
         'scan command',
         'sending stop request to the worker',
         'stop signal received, grace timeout is: ',
@@ -32,6 +33,7 @@ trait InteractsWithIO
         'worker destructed',
         'worker destroyed',
         '[INFO] RoadRunner server started; version:',
+        '[INFO] sdnotify: not notified',
     ];
 
     /**

diff --git 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=3',
             '-o', 'http.address='.$this->option('host').':'.$this->getPort(),
-            '-o', 'server.command='.(new PhpExecutableFinder)->find().' '.base_path(config('octane.roadrunner.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->rpcHost().':'.$this->rpcPort(),