projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
60dec7d
)
fix retry time
author
Alan
<alan@roojs.com>
Fri, 13 Oct 2023 03:05:32 +0000
(11:05 +0800)
committer
Alan
<alan@roojs.com>
Fri, 13 Oct 2023 03:05:32 +0000
(11:05 +0800)
NotifySend.php
patch
|
blob
|
history
diff --git
a/NotifySend.php
b/NotifySend.php
index
0eef1c7
..
34318c0
100644
(file)
--- a/
NotifySend.php
+++ b/
NotifySend.php
@@
-333,11
+333,12
@@
class Pman_Core_NotifySend extends Pman
$this->errorHandler( $ev->remarks);
}
$this->errorHandler( $ev->remarks);
}
+ $retry_when = date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES'));
//$this->addEvent('NOTIFY', $w, 'GREYLISTED ' . $p->email . ' ' . $res->toString());
// we can only update act_when if it has not been sent already (only happens when running in force mode..)
// set act when if it's empty...
//$this->addEvent('NOTIFY', $w, 'GREYLISTED ' . $p->email . ' ' . $res->toString());
// we can only update act_when if it has not been sent already (only happens when running in force mode..)
// set act when if it's empty...
- $w->act_when = (!$w->act_when || $w->act_when == '0000-00-00 00:00:00') ?
date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES'))
: $w->act_when;
+ $w->act_when = (!$w->act_when || $w->act_when == '0000-00-00 00:00:00') ?
$retry_when
: $w->act_when;
$w->update($ww);
$w->update($ww);
@@
-492,7
+493,7
@@
class Pman_Core_NotifySend extends Pman
//print_r($res);
$ev = $this->addEvent('NOTIFY', $w, 'GREYLISTED - ' . $errmsg);
//print_r($res);
$ev = $this->addEvent('NOTIFY', $w, 'GREYLISTED - ' . $errmsg);
- $this->server->updateNotifyToNextServer($w,
strtotime('NOW + ' . $retry . ' MINUTES')
,true);
+ $this->server->updateNotifyToNextServer($w,
$retry_when
,true);
$this->errorHandler( $ev->remarks);
}
$this->errorHandler( $ev->remarks);
}
@@
-524,7
+525,7
@@
class Pman_Core_NotifySend extends Pman
if ($res->userinfo['smtpcode'] == 550) {
if ($this->server->checkSmtpResponse($errmsg, $core_domain)) {
$ev = $this->addEvent('NOTIFY', $w, 'BLACKLISTED - ' . $errmsg);
if ($res->userinfo['smtpcode'] == 550) {
if ($this->server->checkSmtpResponse($errmsg, $core_domain)) {
$ev = $this->addEvent('NOTIFY', $w, 'BLACKLISTED - ' . $errmsg);
- $this->server->updateNotifyToNextServer($w,
strtotime('NOW + ' . $retry . ' MINUTES')
,true);
+ $this->server->updateNotifyToNextServer($w,
$retry_when
,true);
$this->errorHandler( $ev->remarks);
}
}
$this->errorHandler( $ev->remarks);
}
}
@@
-542,7
+543,7
@@
class Pman_Core_NotifySend extends Pman
$ev = $this->addEvent('NOTIFY', $w, 'GREYLIST - NO HOST CAN BE CONTACTED:' . $p->email);
$ev = $this->addEvent('NOTIFY', $w, 'GREYLIST - NO HOST CAN BE CONTACTED:' . $p->email);
- $this->server->updateNotifyToNextServer($w,
strtotime('NOW + ' . $retry . ' MINUTES')
,true);
+ $this->server->updateNotifyToNextServer($w,
$retry_when
,true);