@@ -228,20 +228,22 @@ protected function writeOutput(Job $job, $status, ?Throwable $exception = null)
228
228
*/
229
229
protected function writeOutputForCli (Job $ job , $ status )
230
230
{
231
- $ this ->output ->write (sprintf (
232
- ' <fg=gray>%s</> %s%s ' ,
231
+ $ isVerbose = $ this ->output ->isVerbose ();
232
+
233
+ $ this ->output ->write (rtrim (sprintf (
234
+ ' <fg=gray>%s</> %s %s ' ,
233
235
$ this ->now ()->format ('Y-m-d H:i:s ' ),
234
236
$ job ->resolveName (),
235
- $ this -> output -> isVerbose ()
236
- ? sprintf (' <fg=gray>%s</> ' , $ job ->getJobId ())
237
+ $ isVerbose
238
+ ? sprintf ('<fg=gray>%s</> <fg=blue>%s</> ' , $ job ->getJobId (), $ job -> getQueue ())
237
239
: ''
238
- ));
240
+ ))) ;
239
241
240
242
if ($ status == 'starting ' ) {
241
243
$ this ->latestStartedAt = microtime (true );
242
244
243
245
$ dots = max (terminal ()->width () - mb_strlen ($ job ->resolveName ()) - (
244
- $ this -> output -> isVerbose () ? ( mb_strlen ($ job ->getJobId ()) + 1 ) : 0
246
+ $ isVerbose ? mb_strlen ($ job ->getJobId ()) + mb_strlen ( $ job -> getQueue ()) + 2 : 0
245
247
) - 33 , 0 );
246
248
247
249
$ this ->output ->write (' ' .str_repeat ('<fg=gray>.</> ' , $ dots ));
@@ -252,7 +254,7 @@ protected function writeOutputForCli(Job $job, $status)
252
254
$ runTime = $ this ->runTimeForHumans ($ this ->latestStartedAt );
253
255
254
256
$ dots = max (terminal ()->width () - mb_strlen ($ job ->resolveName ()) - (
255
- $ this -> output -> isVerbose () ? ( mb_strlen ($ job ->getJobId ()) + 1 ) : 0
257
+ $ isVerbose ? mb_strlen ($ job ->getJobId ()) + mb_strlen ( $ job -> getQueue ()) + 2 : 0
256
258
) - mb_strlen ($ runTime ) - 31 , 0 );
257
259
258
260
$ this ->output ->write (' ' .str_repeat ('<fg=gray>.</> ' , $ dots ));
0 commit comments