From: Alan <alan@roojs.com>
Date: Wed, 9 Aug 2023 09:24:53 +0000 (+0800)
Subject: more refinements
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=2bc29f2db54a5ef4e7cb9143cef0dd3a95576bb6

more refinements
---

diff --git a/Notify.php b/Notify.php
index 437e3550..a21a7107 100644
--- a/Notify.php
+++ b/Notify.php
@@ -256,7 +256,7 @@ class Pman_Core_Notify extends Pman
                 $this->logecho("COMPLETED MAIN QUEUE - running maxed out domains");
                 if ($this->domain_queue !== false) {
                     $this->queue  = $this->remainingDomainQueue();
-                    $this->domain_queue  = false;
+                     
                     continue;
                 }
                 break; // nothing more in queue.. and no remaining one
@@ -593,6 +593,7 @@ class Pman_Core_Notify extends Pman
         foreach($this->domain_queue as $dom => $ar) {
             $ret = array_merge($ret, $ar);
         }
+        $this->domain_queue = false;
         return $ret;
     }
     
diff --git a/NotifySend.php b/NotifySend.php
index 701c1cbd..0404f6c7 100644
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -341,7 +341,7 @@ class Pman_Core_NotifySend extends Pman
                 $w->act_when = date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES'));
                 $this->updateServer($w);
                 $w->update($ww);
-                $this->errorHandler(date('Y-m-d h:i:s') . " - MX LOOKUP FAILED\n");
+                $this->errorHandler(date('Y-m-d h:i:s') . " - MX LOOKUP FAILED {$dom}\n");
             }
             
             $ev = $this->addEvent('NOTIFYFAIL', $w, "BAD ADDRESS - BAD DOMAIN - ". $p->email );