[9.x] Improves queue:work command output (#44971)

* Improves command work output

* Removes non needed code

* Avoids non-necessary variable

Author: nunomaduro

src/Illuminate/Queue/Console/WorkCommand.php

@@ -13,6 +13,7 @@
 use Illuminate\Queue\WorkerOptions;
 use Illuminate\Support\Carbon;
 use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Terminal;
 use function Termwind\terminal;
 
 #[AsCommand(name: 'queue:work')]
@@ -80,13 +81,6 @@ class WorkCommand extends Command
      */
     protected $latestStartedAt;
 
-    /**
-     * Holds the status of the last processed job, if any.
-     *
-     * @var string|null
-     */
-    protected $latestStatus;
-
     /**
      * Create a new queue work command.
      *
@@ -126,9 +120,11 @@ public function handle()
         // connection being run for the queue operation currently being executed.
         $queue = $this->getQueue($connection);
 
-        $this->components->info(
-            sprintf('Processing jobs from the [%s] %s.', $queue, str('queue')->plural(explode(',', $queue)))
-        );
+        if (Terminal::hasSttyAvailable()) {
+            $this->components->info(
+                sprintf('Processing jobs from the [%s] %s.', $queue, str('queue')->plural(explode(',', $queue)))
+            );
+        }
 
         return $this->runWorker(
             $connection, $queue
@@ -208,28 +204,37 @@ protected function listenForEvents()
      */
     protected function writeOutput(Job $job, $status)
     {
+        $this->output->write(sprintf(
+            '  <fg=gray>%s</> %s%s',
+            Carbon::now()->format('Y-m-d H:i:s'),
+            $job->resolveName(),
+            $this->output->isVerbose()
+                ? sprintf(' <fg=gray>%s</>', $job->getJobId())
+                : ''
+        ));
+
         if ($status == 'starting') {
             $this->latestStartedAt = microtime(true);
-            $this->latestStatus = $status;
 
-            $formattedStartedAt = Carbon::now()->format('Y-m-d H:i:s');
+            $dots = max(terminal()->width() - mb_strlen($job->resolveName()) - (
+                $this->output->isVerbose() ? (mb_strlen($job->getJobId()) + 1) : 0
+            ) - 33, 0);
 
-            return $this->output->write("  <fg=gray>{$formattedStartedAt}</> {$job->resolveName()}");
-        }
+            $this->output->write(' '.str_repeat('<fg=gray>.</>', $dots));
 
-        if ($this->latestStatus && $this->latestStatus != 'starting') {
-            $formattedStartedAt = Carbon::createFromTimestamp($this->latestStartedAt)->format('Y-m-d H:i:s');
-
-            $this->output->write("  <fg=gray>{$formattedStartedAt}</> {$job->resolveName()}");
+            return $this->output->writeln(' <fg=yellow;options=bold>RUNNING</>');
         }
 
         $runTime = number_format((microtime(true) - $this->latestStartedAt) * 1000, 2).'ms';
-        $dots = max(terminal()->width() - mb_strlen($job->resolveName()) - mb_strlen($runTime) - 31, 0);
+
+        $dots = max(terminal()->width() - mb_strlen($job->resolveName()) - (
+            $this->output->isVerbose() ? (mb_strlen($job->getJobId()) + 1) : 0
+        ) - mb_strlen($runTime) - 31, 0);
 
         $this->output->write(' '.str_repeat('<fg=gray>.</>', $dots));
         $this->output->write(" <fg=gray>$runTime</>");
 
-        $this->output->writeln(match ($this->latestStatus = $status) {
+        $this->output->writeln(match ($status) {
             'success' => ' <fg=green;options=bold>DONE</>',
             'released_after_exception' => ' <fg=yellow;options=bold>FAIL</>',
             default => ' <fg=red;options=bold>FAIL</>',

src/Illuminate/Queue/Listener.php

@@ -173,9 +173,7 @@ protected function createCommand($connection, $queue, ListenerOptions $options)
     public function runProcess(Process $process, $memory)
     {
         $process->run(function ($type, $line) {
-            if (! str($line)->contains('Processing jobs from the')) {
-                $this->handleWorkerOutput($type, $line);
-            }
+            $this->handleWorkerOutput($type, $line);
         });
 
         // Once we have run the job we'll go check if the memory limit has been exceeded