Additional fixes for 14616471
This commit is contained in:
@@ -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;
|
||||
}),
|
||||
];
|
||||
|
Reference in New Issue
Block a user