DataObjects/Core_notify.php

[Pman.Core] / Notify.php

diff --git a/Notify.php b/Notify.php
index ebbfc3e..2fa4af8 100644 (file)
--- a/Notify.php
+++ b/Notify.php
@@ -65,7 +65,7 @@ class Pman_Core_Notify extends Pman
         ),
          'limit' => array(
             'desc' => 'Limit search for no. to send to ',
-            'default' => 50,
+            'default' => 1000,
             'short' => 'L',
             'min' => 0,
             'max' => 999,
@@ -85,8 +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';
@@ -118,7 +128,7 @@ class Pman_Core_Notify extends Pman
         }
         
         if (empty($opts['limit'])) {
-            $opts['limit'] = '1000';
+            $opts['limit'] = '1000'; // not sure why it's not picking up the defautl..
         }
         //date_default_timezone_set('UTC');
        // phpinfo();exit;
@@ -195,11 +205,23 @@ class Pman_Core_Notify extends Pman
             exit;
         }
         
-        echo "BATCH SIZE: ".  count($ar) . "\n");
+        //echo "BATCH SIZE: ".  count($ar) . "\n";
         $pushed = array();
+        $requeue = array();
         while (true) {
+            
+            
+            echo "BATCH SIZE: ".  count($ar) . "\n";
+            
             if (empty($ar)) {
-                break;
+                echo "COMPLETED MAIN QUEUE - running delated\n";
+                
+                if (empty($pushed)) {
+                    break;
+                }
+                $ar = $pushed;
+                $pushed = false;
+                continue;
             }
             
             
@@ -209,19 +231,16 @@ class Pman_Core_Notify extends Pman
                 sleep(3);
                 continue;
             }
-            if ($this->poolHasDomain($p->person_id_email)) {
-                if (in_array($p->person_id_email, $pushed)) {
-                    // it's been pushed to the end, and nothing has
-                    // been pushed since.s
-                    // give up, let the next run sort it out.
-                    break;
-                }
+            if ($this->poolHasDomain($p->person_id_email) > $this->max_to_domain) {
                 
-                $ar[] = $p; // push it on the end..
+                if ($pushed === false) {
+                    // we only try once to requeue..
+                    $requeue[] = $p;
+                    continue;
+                }
+                $pushed[] = $p;
                 
-                $pushed[] = $p->person_id_email;
                 
-                echo "domain {$p->person_id_email} already on queue, pushing to end.\n";
                 //sleep(3);
                 continue;
             }
@@ -231,8 +250,6 @@ class Pman_Core_Notify extends Pman
             
             
             
-            $pushed = array();
-            
         }
         
         // we should have a time limit here...
@@ -240,13 +257,29 @@ class Pman_Core_Notify extends Pman
             $this->poolfree();
              sleep(3);
         }
+         
+        foreach($requeue as $p) {
+            $pp = clone($p);
+            $p->act_when = $p->sqlValue('NOW + INTERVAL 1 MINUTE');
+            $p->update($pp);
+            
+        }
+        
+        
         
         die("DONE\n");
     }
     
     function run($id, $email, $cmdOpts="")
     {
-       // phpinfo();exit;
+        
+        static $renice = false;
+        if (!$renice) {
+            require_once 'System.php';
+            $renice = System::which('renice');
+        }
+        
+        // phpinfo();exit;
         $tn = tempnam(ini_get('session.save_path'),'stdout') . '.stdout';
         $descriptorspec = array(
             0 => array("pipe", 'r'),  // stdin is a pipe that the child will read from
@@ -271,6 +304,12 @@ class Pman_Core_Notify extends Pman
         echo "call proc_open $cmd\n";
         
         
+        if ($this->max_pool_size === 1) {
+            passthru($cmd);
+            return;
+        }
+        
+        
         if (!empty($this->opts['dryrun'])) {
             echo "DRY RUN\n";
             return;
@@ -278,6 +317,11 @@ class Pman_Core_Notify extends Pman
         
         $p = proc_open($cmd, $descriptorspec, $pipes, $cwd );
         $info =  proc_get_status($p);
+        
+        if ($this->nice_level !== false) { 
+            $rcmd = "$renice {$this->nice_level} {$info['pid']}";
+            `$rcmd`;
+        } 
         $this->pool[] = array(
                 'proc' => $p,
                 'pid' => $info['pid'],
@@ -364,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;
         
     }