From: Alan Date: Fri, 13 Oct 2023 06:23:38 +0000 (+0800) Subject: try and shift next server in fixed time X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=ede9a5d69423c5c5d5dd611f79ba0897063ff1a7 try and shift next server in fixed time --- diff --git a/Notify.php b/Notify.php index 4f645af3..5ed6a7b5 100644 --- a/Notify.php +++ b/Notify.php @@ -293,11 +293,14 @@ class Pman_Core_Notify extends Pman $black = $this->server->isBlacklisted($email); if ($black !== false) { - + $this->logecho("Blacklisted - try giving it to next server"); if (false === $this->server->updateNotifyToNextServer($p)) { $ev = $this->addEvent('NOTIFY', $p, 'BLACKLISTED FROM our DB'); - $this->server->updateNotifyToNextServer($w, strtotime('NOW + 5 MINUTES'),true); + // we dont have an althenative server to update it with. + $this->logecho("Blacklisted - next server did not work - try again in 30 mins"); + $this->server->updateNotifyToNextServer($w, date("Y-m-d H:i:s", strtotime('NOW + 30 MINUTES')),true); // $this->errorHandler( $ev->remarks); + } continue; @@ -609,6 +612,7 @@ class Pman_Core_Notify extends Pman function clearOld() { if ($this->server->isFirstServer()) { + $p = DB_DataObject::factory($this->table); $p->whereAdd(" sent < '2000-01-01'