Pman.Dialog.CoreEmail.bjs

[Pman.Core] / Notify.php

diff --git a/Notify.php b/Notify.php
index fd58209..46f7e8f 100644 (file)
--- a/Notify.php
+++ b/Notify.php
@@ -97,14 +97,34 @@ class Pman_Core_Notify extends Pman
     var $max_to_domain = 10;
     
     /**
-     * @var $maxruntime - maximum time a child is allowed to run - defaut 2 minutes
+     * @var $maxruntime - maximum seconds a child is allowed to run - defaut 2 minutes
      */
     var $maxruntime = 120;
     
+    /**
+    * @var {Boolean} log_events - default true if events should be logged.
+    */
+    var $log_events = true;
+    /**
+    * @var {Number} try_again_minutes how long after failing to try again default = 30 if max runtime fails
+    */
+    var $try_again_minutes = 30;
+    
+    /**
+     * @var {String} table - the table that the class will query for notification events
+     */
     var $table = 'core_notify';
+    /**
+     * @var {String} target - the application that will run for each Row in the table (eg. Pman/Core/NotifySend)
+     */
     var $target = 'Core/NotifySend';
+    
+    
+    
     var $evtype = ''; // any notification...
                     // this script should only handle EMAIL notifications..
+                    
+                    
     var $force = false;
     function getAuth()
     {
@@ -209,7 +229,8 @@ class Pman_Core_Notify extends Pman
         $pushed = array();
         $requeue = array();
         while (true) {
-            if ($w->fetch()) {
+            // only add if we don't have any queued up..
+            if (empty($ar) && $w->fetch()) {
                 $ar[] = clone($w);
                 $total--;
             }
@@ -311,7 +332,7 @@ class Pman_Core_Notify extends Pman
     
     
     
-    function run($id, $email, $cmdOpts="")
+    function run($id, $email='', $cmdOpts="")
     {
         
         static $renice = false;
@@ -321,9 +342,9 @@ class Pman_Core_Notify extends Pman
         }
         
         // phpinfo();exit;
-        $tnx = tempnam(ini_get('session.save_path'),'stdout');
-        unlink($tnx);
-        $tn =  $tnx . '.stdout';
+        
+        
+        $tn =  $this->tempName('stdout', true);
         $descriptorspec = array(
             0 => array("pipe", 'r'),  // stdin is a pipe that the child will read from
             1 => array("file", $tn, 'w'),  // stdout is a pipe that the child will write to
@@ -419,14 +440,16 @@ class Pman_Core_Notify extends Pman
                     $this->logecho("TERMINATING: ({$p['pid']}) " . $p['cmd'] . " : " . file_get_contents($p['out']));
                     @unlink($p['out']);
                     
+                    // schedule again
                     $w = DB_DataObject::factory($this->table);
                     $w->get($p['notify_id']);
                     $ww = clone($w);
-                    $this->addEvent('NOTIFY', $w, 'TERMINATED - TIMEOUT');
-                    $w->act_when = date('Y-m-d H:i:s', strtotime('NOW + 30  MINUTES'));
+                    if ($this->log_events) {
+                        $this->addEvent('NOTIFY', $w, 'TERMINATED - TIMEOUT');
+                    }
+                    $w->act_when = date('Y-m-d H:i:s', strtotime("NOW + {$this->try_again_minutes} MINUTES"));
                     $w->update($ww);
                     
-                    
                     continue;
                 }
                 
@@ -466,9 +489,11 @@ class Pman_Core_Notify extends Pman
     function poolHasDomain($email)
     {
         $ret = 0;
-        $dom = strtolower(array_pop(explode('@',$email)));
+        $ea = explode('@',$email);
+        $dom = strtolower(array_pop($ea));
         foreach($this->pool as $p) {
-            $mdom = strtolower(array_pop(explode('@',$p['email'])));
+            $ea = explode('@',$p['email']);
+            $mdom = strtolower(array_pop($ea));
             if ($mdom == $dom) {
                 $ret++;
             }