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

Improvements to mail send job and to reduce the number of failed polls going to the failed job table and improvements to determining downlinks

Browse Source
This commit is contained in:
Deon George
2025-04-17 09:33:32 +10:00
parent 3f0e17e20b
commit 1461647159
3 changed files with 61 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
app/Jobs/AddressPoll.php
View File

@@ -9,6 +9,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\ManuallyFailedException;
use Illuminate\Queue\MaxAttemptsExceededException;
use Illuminate\Queue\Middleware\Skip;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\Log;
@@ -36,8 +37,10 @@ class AddressPoll implements ShouldQueue, ShouldBeUnique
private Address $ao;
private ?Mailer $mo;
// Whether to force poll even if there isnt anything waiting to send
private bool $force = FALSE;
public function __construct(Address $ao,Mailer $mo=NULL)
public function __construct(Address $ao,Mailer $mo=NULL,bool $force=FALSE)
{
$this->ao = $ao->withoutRelations();
$this->mo = $mo?->withoutRelations();
@@ -77,14 +80,8 @@ class AddressPoll implements ShouldQueue, ShouldBeUnique
/**
* When calling MessageProcess - we assume that the packet is from a valid source
*/
public function handle()
public function handle(): void
{
if (! $this->ao->system->mailer_preferred->count() || ($this->mo && (! $this->ao->system->mailer_preferred->find($this->mo)))) {
$this->fail('Missing mailer details');
return;
}
Log::info(sprintf('%s:- Polling [%s] - attempt [%d]',self::LOGKEY,$this->ao->ftn,$this->attempts()));
$setup = Config::get('setup',Setup::findOrFail(config('app.id')));
@@ -144,15 +141,15 @@ class AddressPoll implements ShouldQueue, ShouldBeUnique
switch (get_class($exception)) {
case ManuallyFailedException::class:
Log::error(sprintf('%s:! Address Poll failed for [%s] (%s)',self::LOGKEY,$this->ao->ftn,$exception->getMessage()));
break;
exit(0);
case MaxAttemptsExceededException::class:
Log::error(sprintf('%s:! Address Poll was tried too many times for [%s]',self::LOGKEY,$this->ao->ftn));
Notification::route('netmail',$this->ao)->notify(new PollingFailed);
Notification::route('netmail',$this->ao)
->notify(new PollingFailed);
$this->ao->system->autohold = TRUE;
$this->ao->system->save();
exit(0);
default:
@@ -160,6 +157,38 @@ class AddressPoll implements ShouldQueue, ShouldBeUnique
}
}
public function middleware(): array
{
return [
// If there are no mailer details, we cant poll
Skip::when(function(): bool {
if (! $this->ao->system->mailer_preferred->count()
// If we specify a mailer, make sure it is preferred by the system
|| ($this->mo && (! $this->ao->system->mailer_preferred->find($this->mo)))) {
Log::error(sprintf('%s:! No mailer details, cannot poll [%s]',self::LOGKEY,$this->ao->ftn));
return TRUE;
}
return FALSE;
}),
// If there is no mail anymore, no need trying
Skip::unless(function(): bool {
if ($this->force
|| ($this->ao->echomailWaitingCount() > 0)
|| ($this->ao->fileWaitingCount() > 0)
|| ($this->ao->netmailWaitingCount() > 0)) {
return TRUE;
}
Log::info(sprintf('%s:/ Nothing waiting - abandoning poll [%s]',self::LOGKEY,$this->ao->ftn));
return FALSE;
}),
];
}
public function uniqueId(): string
{
return $this->ao->id;