projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ded32f3
)
NotifySend.php
author
Alan
<alan@roojs.com>
Fri, 6 Oct 2023 04:55:59 +0000
(12:55 +0800)
committer
Alan
<alan@roojs.com>
Fri, 6 Oct 2023 04:55:59 +0000
(12:55 +0800)
NotifySend.php
patch
|
blob
|
history
diff --git
a/NotifySend.php
b/NotifySend.php
index
6176a7f
..
78babd8
100644
(file)
--- a/
NotifySend.php
+++ b/
NotifySend.php
@@
-227,13
+227,8
@@
class Pman_Core_NotifySend extends Pman
if (isset($email['later'])) {
if (isset($email['later'])) {
- if (false == $this->server->updateNotifyToNextServer($w, $email['later'])) {
- // we could not find another server - we can try again.
- $pp = clone($w);
- $w->act_when = $email['later'];
- $w->update($pp);
- }
-
+ $this->server->updateNotifyToNextServer($w, $email['later'],true);
+
$this->errorHandler(date('Y-m-d h:i:s ') . " Delivery postponed by email creator to {$email['later']}");
}
$this->errorHandler(date('Y-m-d h:i:s ') . " Delivery postponed by email creator to {$email['later']}");
}
@@
-487,13
+482,10
@@
class Pman_Core_NotifySend extends Pman
}
//print_r($res);
$this->addEvent('NOTIFY', $w, 'GREYLISTED - ' . $errmsg);
}
//print_r($res);
$this->addEvent('NOTIFY', $w, 'GREYLISTED - ' . $errmsg);
- $w->act_when = date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES'));
- $this->updateServer($w);
- $w->domain_id = $core_domain->id;
- $w->update($ww);
+ $this->server->updateNotifyToNextServer($w, strtotime('NOW + ' . $retry . ' MINUTES'),true);
- $this->errorHandler(date('Y-m-d h:i:s') .
" - GREYLISTED - $errmsg \n"
);
+ $this->errorHandler(date('Y-m-d h:i:s') .
' ' . $ev->remarks
);
}
$fail = true;
break;
}
$fail = true;
break;