Update job:list, and change "subject" to "jobname"
This commit is contained in:
parent
72d68fa1ab
commit
752462d20f
@ -39,7 +39,7 @@ class JobList extends Command
|
||||
$o->uuid,
|
||||
$o->id,
|
||||
$o->display_name,
|
||||
$o->command->subject,
|
||||
$o->command->jobname,
|
||||
$o->attempts,$o->maxTries,
|
||||
$o->available_at ?: '-',
|
||||
$o->attempts ? sprintf(' (Created:%s)',$o->created_at) : ''
|
||||
|
@ -50,7 +50,7 @@ class AddressPoll implements ShouldQueue, ShouldBeUnique
|
||||
case 'address':
|
||||
return $this->ao;
|
||||
|
||||
case 'subject':
|
||||
case 'jobname':
|
||||
return $this->ao->ftn;
|
||||
|
||||
default:
|
||||
@ -125,7 +125,7 @@ class AddressPoll implements ShouldQueue, ShouldBeUnique
|
||||
}
|
||||
|
||||
} catch (SocketException $e) {
|
||||
Log::error(sprintf('%s:! Unable to connect to [%s]: %s',self::LOGKEY,$this->ao->ftn,$e->getMessage()));
|
||||
Log::error(sprintf('%s:! SocketException Unable to connect to [%s]: %s',self::LOGKEY,$this->ao->ftn,$e->getMessage()));
|
||||
break;
|
||||
|
||||
} catch (\ErrorException $e) {
|
||||
|
@ -47,7 +47,7 @@ class EchoareaImport implements ShouldQueue
|
||||
public function __get($key): mixed
|
||||
{
|
||||
switch ($key) {
|
||||
case 'subject':
|
||||
case 'jobname':
|
||||
return sprintf('%s-%s',$this->do->name,$this->file);
|
||||
|
||||
default:
|
||||
|
@ -47,7 +47,7 @@ class FileareaImport implements ShouldQueue
|
||||
public function __get($key): mixed
|
||||
{
|
||||
switch ($key) {
|
||||
case 'subject':
|
||||
case 'jobname':
|
||||
return sprintf('%s-%s',$this->do->name,$this->file);
|
||||
|
||||
default:
|
||||
|
@ -41,8 +41,9 @@ class MessageProcess implements ShouldQueue
|
||||
public function __get($key): mixed
|
||||
{
|
||||
switch ($key) {
|
||||
case 'subject':
|
||||
return sprintf('%s-%s-%s',$this->pktname,$this->mo->set->get('set_sender')->ftn,$this->mo->msgid);
|
||||
case 'jobname':
|
||||
$mo = unserialize($this->mo);
|
||||
return sprintf('%s-%s-%s',$mo->set->get('set_pkt'),$mo->set->get('set_sender')->ftn,$mo->msgid);
|
||||
|
||||
default:
|
||||
return NULL;
|
||||
|
@ -58,7 +58,7 @@ class NodelistImport implements ShouldQueue
|
||||
public function __get($key): mixed
|
||||
{
|
||||
switch ($key) {
|
||||
case 'subject':
|
||||
case 'jobname':
|
||||
return sprintf('%s-%s',$this->domain?->name,is_object($this->file) ? $this->file->name : $this->file);
|
||||
|
||||
default:
|
||||
|
@ -44,7 +44,7 @@ class PacketProcess implements ShouldQueue
|
||||
public function __get($key): mixed
|
||||
{
|
||||
switch ($key) {
|
||||
case 'subject':
|
||||
case 'jobname':
|
||||
return $this->filename;
|
||||
|
||||
default:
|
||||
|
@ -42,7 +42,7 @@ class TicProcess implements ShouldQueue
|
||||
public function __get($key): mixed
|
||||
{
|
||||
switch ($key) {
|
||||
case 'subject':
|
||||
case 'jobname':
|
||||
return sprintf('%s %s',$this->do?->name,$this->file);
|
||||
|
||||
default:
|
||||
|
Loading…
Reference in New Issue
Block a user