Additional fixes for 14616471
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 30s
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m36s
Create Docker Image / Final Docker Image Manifest (push) Successful in 8s

This commit is contained in:
2025-04-17 14:18:15 +10:00
parent 99dc13b297
commit c6458219bf
2 changed files with 18 additions and 28 deletions

View File

@@ -170,20 +170,16 @@ class AddressPoll implements ShouldQueue, ShouldBeUnique
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)) {
// If there is no mail anymore, no need trying
if ((! $this->force)
&& ($this->ao->echomailWaitingCount() === 0)
&& ($this->ao->filesWaitingCount() === 0)
&& ($this->ao->netmailWaitingCount() === 0)) {
Log::info(sprintf('%s:/ Nothing waiting - abandoning poll [%s]',self::LOGKEY,$this->ao->ftn));
return TRUE;
}
Log::info(sprintf('%s:/ Nothing waiting - abandoning poll [%s]',self::LOGKEY,$this->ao->ftn));
return FALSE;
}),
];