DataObjects/Core_notify.php

[Pman.Core] / Notify.php

diff --git a/Notify.php b/Notify.php
index 6604213..2fa4af8 100644 (file)
--- a/Notify.php
+++ b/Notify.php
@@ -85,9 +85,18 @@ class Pman_Core_Notify extends Pman
             'max' => 100,
         ),
     );
-    
+    /**
+     * @var $nice_level Unix 'nice' level to stop it jamming server up.
+     */
     var $nice_level = false;
+    /**
+     * @var $max_pool_size maximum runners to start at once.
+     */
     var $max_pool_size = 10;
+    /**
+     * @var $max_to_domain maximum connections to make to a single domain
+     */
+    var $max_to_domain = 10;
     
     var $table = 'core_notify';
     var $target = 'Core/NotifySend';
@@ -222,7 +231,7 @@ class Pman_Core_Notify extends Pman
                 sleep(3);
                 continue;
             }
-            if ($this->poolHasDomain($p->person_id_email)) {
+            if ($this->poolHasDomain($p->person_id_email) > $this->max_to_domain) {
                 
                 if ($pushed === false) {
                     // we only try once to requeue..
@@ -248,11 +257,10 @@ class Pman_Core_Notify extends Pman
             $this->poolfree();
              sleep(3);
         }
-        
-        
+         
         foreach($requeue as $p) {
             $pp = clone($p);
-            $p->act_when = strtotime($p->act_when .  ' + 1 MINUTE');
+            $p->act_when = $p->sqlValue('NOW + INTERVAL 1 MINUTE');
             $p->update($pp);
             
         }
@@ -400,14 +408,15 @@ class Pman_Core_Notify extends Pman
      */
     function poolHasDomain($email)
     {
+        $ret = 0;
         $dom = strtolower(array_pop(explode('@',$email)));
         foreach($this->pool as $p) {
             $mdom = strtolower(array_pop(explode('@',$p['email'])));
             if ($mdom == $dom) {
-                return true;
+                $ret++;
             }
         }
-        return false;
+        return $ret;
         
     }