projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3d55c24
)
more refinements
author
Alan
<alan@roojs.com>
Wed, 9 Aug 2023 09:24:53 +0000
(17:24 +0800)
committer
Alan
<alan@roojs.com>
Wed, 9 Aug 2023 09:24:53 +0000
(17:24 +0800)
Notify.php
patch
|
blob
|
history
NotifySend.php
patch
|
blob
|
history
diff --git
a/Notify.php
b/Notify.php
index
437e355
..
a21a710
100644
(file)
--- 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->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
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);
}
foreach($this->domain_queue as $dom => $ar) {
$ret = array_merge($ret, $ar);
}
+ $this->domain_queue = false;
return $ret;
}
return $ret;
}
diff --git
a/NotifySend.php
b/NotifySend.php
index
701c1cb
..
0404f6c
100644
(file)
--- 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);
$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 );
}
$ev = $this->addEvent('NOTIFYFAIL', $w, "BAD ADDRESS - BAD DOMAIN - ". $p->email );