bbs/clrghouz
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Update job:list, and change "subject" to "jobname"

Browse Source
This commit is contained in:
Deon George 2024-05-21 21:10:58 +10:00
parent 72d68fa1ab
commit 752462d20f
8 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/JobList.php
View File

@ -39,7 +39,7 @@ class JobList extends Command
$o->uuid, $o->uuid,
$o->id, $o->id,
$o->display_name, $o->display_name,
$o->command->subject, $o->command->jobname,
$o->attempts,$o->maxTries, $o->attempts,$o->maxTries,
$o->available_at ?: '-', $o->available_at ?: '-',
$o->attempts ? sprintf(' (Created:%s)',$o->created_at) : '' $o->attempts ? sprintf(' (Created:%s)',$o->created_at) : ''

4
app/Jobs/AddressPoll.php
View File

@ -50,7 +50,7 @@ class AddressPoll implements ShouldQueue, ShouldBeUnique
case 'address': case 'address':
return $this->ao; return $this->ao;
case 'subject': case 'jobname':
return $this->ao->ftn; return $this->ao->ftn;
default: default:
@ -125,7 +125,7 @@ class AddressPoll implements ShouldQueue, ShouldBeUnique
} }
} catch (SocketException $e) { } 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; break;
} catch (\ErrorException $e) { } catch (\ErrorException $e) {

2
app/Jobs/EchoareaImport.php
View File

@ -47,7 +47,7 @@ class EchoareaImport implements ShouldQueue
public function __get($key): mixed public function __get($key): mixed
{ {
switch ($key) { switch ($key) {
case 'subject': case 'jobname':
return sprintf('%s-%s',$this->do->name,$this->file); return sprintf('%s-%s',$this->do->name,$this->file);
default: default:

2
app/Jobs/FileareaImport.php
View File

@ -47,7 +47,7 @@ class FileareaImport implements ShouldQueue
public function __get($key): mixed public function __get($key): mixed
{ {
switch ($key) { switch ($key) {
case 'subject': case 'jobname':
return sprintf('%s-%s',$this->do->name,$this->file); return sprintf('%s-%s',$this->do->name,$this->file);
default: default:

5
app/Jobs/MessageProcess.php
View File

@ -41,8 +41,9 @@ class MessageProcess implements ShouldQueue
public function __get($key): mixed public function __get($key): mixed
{ {
switch ($key) { switch ($key) {
case 'subject': case 'jobname':
return sprintf('%s-%s-%s',$this->pktname,$this->mo->set->get('set_sender')->ftn,$this->mo->msgid); $mo = unserialize($this->mo);
return sprintf('%s-%s-%s',$mo->set->get('set_pkt'),$mo->set->get('set_sender')->ftn,$mo->msgid);
default: default:
return NULL; return NULL;

2
app/Jobs/NodelistImport.php
View File

@ -58,7 +58,7 @@ class NodelistImport implements ShouldQueue
public function __get($key): mixed public function __get($key): mixed
{ {
switch ($key) { switch ($key) {
case 'subject': case 'jobname':
return sprintf('%s-%s',$this->domain?->name,is_object($this->file) ? $this->file->name : $this->file); return sprintf('%s-%s',$this->domain?->name,is_object($this->file) ? $this->file->name : $this->file);
default: default:

2
app/Jobs/PacketProcess.php
View File

@ -44,7 +44,7 @@ class PacketProcess implements ShouldQueue
public function __get($key): mixed public function __get($key): mixed
{ {
switch ($key) { switch ($key) {
case 'subject': case 'jobname':
return $this->filename; return $this->filename;
default: default:

2
app/Jobs/TicProcess.php
View File

@ -42,7 +42,7 @@ class TicProcess implements ShouldQueue
public function __get($key): mixed public function __get($key): mixed
{ {
switch ($key) { switch ($key) {
case 'subject': case 'jobname':
return sprintf('%s %s',$this->do?->name,$this->file); return sprintf('%s %s',$this->do?->name,$this->file);
default: default: