diff --git a/app/Console/Commands/JobList.php b/app/Console/Commands/JobList.php index 2955e16..1af5a54 100644 --- a/app/Console/Commands/JobList.php +++ b/app/Console/Commands/JobList.php @@ -35,15 +35,14 @@ class JobList extends Command $lastq = $o->queue; } - $this->info(sprintf('%s-%d: %s[%s] - %d tries (Created: %s,Timeout: %s,Next: %s)', + $this->info(sprintf('%s-%d: %s[%s] - %d/%d tries [Next:%s]%s', $o->uuid, $o->id, $o->display_name, $o->command->subject, - $o->attempts, - $o->created_at, - $o->retry_until ?: '-', - $o->reserved_at ?: '-', + $o->attempts,$o->maxTries, + $o->available_at ?: '-', + $o->attempts ? sprintf(' (Created:%s)',$o->created_at) : '' )); } } diff --git a/app/Jobs/MailSend.php b/app/Jobs/MailSend.php index 435181c..af5e22d 100644 --- a/app/Jobs/MailSend.php +++ b/app/Jobs/MailSend.php @@ -2,44 +2,23 @@ namespace App\Jobs; -use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldBeUnique; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Queue\SerializesModels; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; use Repat\LaravelJobs\Job; use App\Models\Address; -class MailSend implements ShouldQueue +class MailSend #implements ShouldQueue { - use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; + use Dispatchable; private const LOGKEY = 'JCM'; - private ?bool $crash; - /** * @param bool $crash Send crash mail only */ - public function __construct(bool $crash=NULL) - { - $this->crash = $crash; - } - - public function __get($key): mixed - { - switch ($key) { - case 'subject': - return __METHOD__; - - default: - return NULL; - } - } + public function __construct(private ?bool $crash=NULL) {} /** * Execute the job.