projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #8131 - chinese translations
[Pman.Core]
/
Notify.php
diff --git
a/Notify.php
b/Notify.php
index
4f645af
..
3fd4c5b
100644
(file)
--- a/
Notify.php
+++ b/
Notify.php
@@
-178,6
+178,12
@@
class Pman_Core_Notify extends Pman
function get($r,$opts=array())
{
function get($r,$opts=array())
{
+
+ // if ($this->database_is_locked()) {
+ // die("LATER - DATABASE IS LOCKED");
+ //}
+
+
$this->parseArgs($opts);
//date_default_timezone_set('UTC');
$this->parseArgs($opts);
//date_default_timezone_set('UTC');
@@
-225,6
+231,7
@@
class Pman_Core_Notify extends Pman
if (!$this->force) {
$w->whereAdd('act_when < NOW()'); // eg.. not if future..
}
if (!$this->force) {
$w->whereAdd('act_when < NOW()'); // eg.. not if future..
}
+
$w->orderBy('act_when ASC'); // oldest first.
$total = min($w->count(), $opts['limit']);
$w->orderBy('act_when ASC'); // oldest first.
$total = min($w->count(), $opts['limit']);
@@
-293,11
+300,14
@@
class Pman_Core_Notify extends Pman
$black = $this->server->isBlacklisted($email);
if ($black !== false) {
$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');
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);
// $this->errorHandler( $ev->remarks);
+
}
continue;
}
continue;
@@
-609,6
+619,7
@@
class Pman_Core_Notify extends Pman
function clearOld()
{
if ($this->server->isFirstServer()) {
function clearOld()
{
if ($this->server->isFirstServer()) {
+
$p = DB_DataObject::factory($this->table);
$p->whereAdd("
sent < '2000-01-01'
$p = DB_DataObject::factory($this->table);
$p->whereAdd("
sent < '2000-01-01'