public $is_active;
public $last_send;
+
+
+ function applyFilters($q, $au, $roo)
+ {
+ if (isset($q['_with_queue_size'])) {
+ $this->addQueueSize();
+ }
+ }
+
+
+ function addQueueSize()
+ {
+ // look for database links for server_id (which should find core_notify + others..)
+ $cn = get_class(DB_DataObject::factory('core_notify'));
+ $tables = array();
+ foreach($this->databaseLinks() as $tbl => $kv) {
+ foreach($kv as $k=>$v) {
+ if ($v != 'core_notify_server:id') {
+ continue;
+ }
+
+ $test = DB_DAtaObject::factory($tbl);
+ if (!is_a($test, $cn)) {
+ break;
+ }
+ $tables[] = $tbl;
+ }
+ }
+ if (empty($tables)) {
+ die("OOPS - no tables for notify_server references");
+ }
+ $totals = array();
+ foreach($tables as $t) {
+ $totals[] = "
+ COALESCE((SELECT
+ count(id)
+ FROM
+ $t
+ WHERE
+ server_id = core_notify_server.id
+ AND
+ sent < '1970-01-01' OR sent IS NULL
+ and
+ event_id = 0
+ ),0)
+ ";
+ }
+ $this->selectAdd("(" . implode(" + ", $totals) . ") as in_queue ");
+
+
+
+
+
+ }
+
+
// most services should call this first..
- function getCurrent($notify)
+ function getCurrent($notify, $force = false)
{
static $current = false;;
}
$ns = DB_DataObject::factory('core_notify_server');
+ if (!$ns->count()) {
+ $ns->id = 0;
+ return $ns;
+ }
+
+
$ns->poolname = $notify->poolname;
$ns->is_active = 1;
$ns->hostname = gethostname();
- if (!$ns->count()) {
+ $ns->limit(1);
+ if ($ns->find(true)) {
+ $current = $ns;
+ return $ns;
+ }
+ if (!$force) {
+ $notify->jerr("Server not found for this server " . gethostname() . " in core_notify_server" );
+ }
+ // fallback to any server - if we are using force. (this is so helo will work...)
+
+ $ns = DB_DataObject::factory('core_notify_server');
+ $ns->is_active = 1;
+ $ns->hostname = gethostname();
+ if (!$ns->find(true)) {
$notify->jerr("Server not found for this server " . gethostname() . " in core_notify_server" );
}
- $ns->find(true);
$current = $ns;
return $ns;
}
function isFirstServer()
{
+ if (!$this->id) {
+ return true;
+ }
+
$servers = $this->availableServers();
if (empty($servers)) {
return false;
// called on current server.
function assignQueues($notify)
{
-
+ if (!$this->id) {
+ return true;
+ }
$servers = $this->availableServers();
$ids = array();
+ $up = array();
foreach($servers as $s) {
$ids[] = $s->id;
}
return;
}
- // ((@row_number := CASE WHEN @row_number IS NULL THEN 0 ELSE @row_number END +1) % {$num_servers})
-
$p = DB_DataObject::factory($notify->table);
and
server_id NOT IN (" . implode(",", $ids) . ")
");
- if ($p->count() < 1) {
+ $p->orderBy('act_when asc'); //?
+ $total_add = $p->count();
+ if ($total_add < 1) {
return;
}
+ $to_add = $p->fetchAll('id');
+
+ $p = DB_DataObject::factory($notify->table);
+ $p->whereAdd("
+ sent < '2000-01-01'
+ and
+ event_id = 0
+
+ and
+ server_id IN (" . implode(",", $ids) . ")
+ ");
$p->selectAdd();
- $p->selectAdd("id, ((@row_number := CASE WHEN @row_number IS NULL THEN 0 ELSE @row_number END +1) % {$num_servers}) as rn");
- $kv = $p->fetchAll('id','rn');
- foreach($kv as $id => $r) {
- $up[ $ids[$r] ][] = $id;
+ $p->selectAdd('server_id, count(id) as n');
+ $p->groupBy('server_id');
+ $in_q = $p->fetchAll('server_id', 'n');
+
+ // if queue is empty it will not get allocated anything.
+ foreach($ids as $sid) {
+ if (!isset($in_q[$sid])) {
+ $in_q[$sid] = 0;
+ }
+ }
+ $totalq = 0;
+ foreach($in_q as $sid => $n) {
+ $totalq += $n;
}
+
+
+ // new average queue
+ $target_len = floor( ($totalq + $total_add) / $num_servers );
+
+ foreach($in_q as $sid => $cq) {
+ if ( $cq > $target_len) {
+ continue;
+ }
+ $up[ $sid ] = array_slice($to_add, 0, $target_len - $cq);
+ }
+
+ // add the reminder evently
+ foreach($to_add as $n=>$i) {
+
+ $up[ $ids[$n % $num_servers] ][] = $i;
+ }
+
+ // distribution needs to go to ones that have the shortest queues. - so to balance out the queues
+
+
+
foreach($up as $sid => $nids) {
+ if (empty($nids)) {
+ continue;
+ }
$p = DB_DataObject::factory($notify->table);
$p->query("
UPDATE
SET
server_id = $sid
WHERE
- id IN (". implode(",', $nids"). ')'
+ id IN (". implode(',', $nids). ')'
);
}
function updateNotifyToNextServer( $cn , $when = false, $allow_same = false)
{
+ if (!$this->id) {
+ return;
+ }
+
// fixme - this should take into account blacklisted - and return false if no more servers are available
$email = empty($cn->to_email) ? ($cn->person() ? $cn->person()->email : $cn->to_email) : $cn->to_email;
$good = $s;
break;
}
+ $offset = ($offset + 1) % count($servers);
+ var_dump($offset);
}
if ($good == false && $allow_same) {
$good = $this;
function isBlacklisted($email)
{
+ if (!$this->id) {
+ return false;
+ }
+
// return current server id..
static $cache = array();
-
- // get the domain..
+ // get the domain..
$ea = explode('@',$email);
$dom = strtolower(array_pop($ea));
- if (isset($cache[$dom])) {
- return $cache[$dom];
+ if (isset( $cache[$this->id . '-'. $dom])) {
+ return $cache[$this->id . '-'. $dom];
}
$cd = DB_DataObject::factory('core_domain')->loadOrCreate($dom);
$bl->server_id = $this->id;
$bl->domain_id = $cd->id;
if ($bl->count()) {
- $cache[$dom] = true;
+ $cache[$this->id . '-'. $dom] = true;
return true;
}
}
function initHelo()
{
+ if (!$this->id) {
+ return;
+ }
$ff = HTML_FlexyFramework::get();
$ff->Mail['helo'] = $this->helo;
}
function checkSmtpResponse($errmsg, $core_domain)
{
+ if (!$this->id) {
+ return false;
+ }
$bl = DB_DataObject::factory('core_notify_blacklist');
$bl->server_id = $this->id;
$bl->domain_id = $core_domain->id;
if ($bl->count()) {
- return;
+ return true;
}
// is it a blacklist message
if (!$bl->messageIsBlacklisted($errmsg)) {
- return;
+ return false;
}
+ $bl->error_str = $errmsg;
$bl->added_dt = $bl->sqlValue("NOW()");
$bl->insert();
-
+ return true;
}
projects / Pman.Core / blobdiff