Skip to content

[11.x] Fixes regression with queue:work Command #53076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 9, 2024
Merged

[11.x] Fixes regression with queue:work Command #53076

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions src/Illuminate/Queue/Console/WorkCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public function handle()
// connection being run for the queue operation currently being executed.
$queue = $this->getQueue($connection);

if (! $this->hasOption('json') && Terminal::hasSttyAvailable()) {
if (! $this->outputUsingJson() && Terminal::hasSttyAvailable()) {
$this->components->info(
sprintf('Processing jobs from the [%s] %s.', $queue, str('queue')->plural(explode(',', $queue)))
);
Expand Down Expand Up @@ -201,7 +201,7 @@ protected function listenForEvents()
*/
protected function writeOutput(Job $job, $status, Throwable $exception = null)
{
$this->hasOption('json')
$this->outputUsingJson()
? $this->writeOutputAsJson($job, $status, $exception)
: $this->writeOutputForCli($job, $status);
}
Expand Down Expand Up @@ -346,4 +346,18 @@ protected function downForMaintenance()
{
return $this->option('force') ? false : $this->laravel->isDownForMaintenance();
}

/**
* Determine if the worker should output using JSON.
*
* @return bool
*/
protected function outputUsingJson()
{
if (! $this->hasOption('json')) {
return false;
}

return $this->option('json');
}
}
Loading