[1.x] Fixes Octane's process output not being flushed (#428)

* Fixes issue where `php://temp` may be full * Update InteractsWithServers.php Co-authored-by: Taylor Otwell <[email protected]>
laravel · Nov 29, 2021 · 0dc6539 · 0dc6539
1 parent 56c357d
commit 0dc6539
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/src/Commands/Concerns/InteractsWithServers.php b/src/Commands/Concerns/InteractsWithServers.php
@@ -106,6 +106,19 @@ protected function writeServerRunningMessage()
         ]);
     }
 
+    /**
+     * Retrieve the given server output and flush it.
+     *
+     * @return array
+     */
+    protected function getServerOutput($server)
+    {
+        return tap([
+            $server->getIncrementalOutput(),
+            $server->getIncrementalErrorOutput(),
+        ], fn () => $server->clearOutput()->clearErrorOutput());
+    }
+
     /**
      * Returns the list of signals to subscribe.
      *

diff --git a/src/Commands/StartRoadRunnerCommand.php b/src/Commands/StartRoadRunnerCommand.php
@@ -182,7 +182,9 @@ protected function rpcPort()
      */
     protected function writeServerOutput($server)
     {
-        Str::of($server->getIncrementalOutput())
+        [$output, $errorOutput] = $this->getServerOutput($server);
+
+        Str::of($output)
             ->explode("\n")
             ->filter()
             ->each(function ($output) {
@@ -210,7 +212,7 @@ protected function writeServerOutput($server)
                 }
             });
 
-        Str::of($server->getIncrementalErrorOutput())
+        Str::of($errorOutput)
             ->explode("\n")
             ->filter()
             ->each(function ($output) {

diff --git a/src/Commands/StartSwooleCommand.php b/src/Commands/StartSwooleCommand.php
@@ -170,15 +170,17 @@ protected function taskWorkerCount(SwooleExtension $extension)
      */
     protected function writeServerOutput($server)
     {
-        Str::of($server->getIncrementalOutput())
+        [$output, $errorOutput] = $this->getServerOutput($server);
+
+        Str::of($output)
             ->explode("\n")
             ->filter()
             ->each(fn ($output) => is_array($stream = json_decode($output, true))
                 ? $this->handleStream($stream)
                 : $this->info($output)
             );
 
-        Str::of($server->getIncrementalErrorOutput())
+        Str::of($errorOutput)
             ->explode("\n")
             ->filter()
             ->groupBy(fn ($output) => $output)