restore job id in worker command logs

laravel · Jul 20, 2022 · 87d28b9 · 87d28b9
1 parent 15c88fc
commit 87d28b9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Illuminate/Queue/Console/WorkCommand.php b/src/Illuminate/Queue/Console/WorkCommand.php
@@ -214,17 +214,17 @@ protected function writeOutput(Job $job, $status)
 
             $formattedStartedAt = Carbon::now()->format('Y-m-d H:i:s');
 
-            return $this->output->write("  <fg=gray>{$formattedStartedAt}</> {$job->resolveName()}");
+            return $this->output->write("  <fg=gray>{$formattedStartedAt} {$job->getJobId()}</> {$job->resolveName()}");
         }
 
         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()}");
+            $this->output->write("  <fg=gray>{$formattedStartedAt} {$job->getJobId()}</> {$job->resolveName()}");
         }
 
-        $runTime = number_format((microtime(true) - $this->latestStartedAt) * 1000, 2).'ms';
-        $dots = max(terminal()->width() - mb_strlen($job->resolveName()) - mb_strlen($runTime) - 31, 0);
+        $runTime = number_format((microtime(true) - $this->latestStartedAt) * 1000, 2) . 'ms';
+        $dots = max(terminal()->width() - mb_strlen($job->resolveName().$runTime.$job->getJobId()) - 32, 0);
 
         $this->output->write(' '.str_repeat('<fg=gray>.</>', $dots));
         $this->output->write(" <fg=gray>$runTime</>");