DataObjects/pman.links.ini

[Pman.Core] / Notify.php

diff --git a/Notify.php b/Notify.php
index 5c27f09..9c5ecf9 100644 (file)
--- a/Notify.php
+++ b/Notify.php
@@ -98,6 +98,11 @@ 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 = 120;
+    
     var $table = 'core_notify';
     var $target = 'Core/NotifySend';
     var $evtype = ''; // any notification...
@@ -176,7 +181,7 @@ class Pman_Core_Notify extends Pman
     
             $w->orderBy('act_when ASC'); // oldest first.
             
-            $this->echolog("QUEUE is {$w->count()}");
+            $this->logecho("QUEUE is {$w->count()}");
             
             $w->limit($opts['limit']); // we can run 1000 ...
         } else {
@@ -267,8 +272,8 @@ class Pman_Core_Notify extends Pman
         }
         
         
-        
-        die("DONE\n");
+        $this->logecho("DONE");
+        exit;
     }
     
     function run($id, $email, $cmdOpts="")
@@ -349,8 +354,7 @@ class Pman_Core_Notify extends Pman
     {
         $pool = array();
         clearstatcache();
-        $maxruntime = 2 * 60; // 2 minutes.. ?? should be long enoguh
-        
+         
         foreach($this->pool as $p) {
              
             //echo "CHECK PID: " . $p['pid'] . "\n";
@@ -370,7 +374,7 @@ class Pman_Core_Notify extends Pman
                 //if (file_exists('/proc/'.$p['pid'])) {
                 $runtime = time() - $p['started'];
                 //echo "RUNTIME ({$p['pid']}): $runtime\n";
-                if ($runtime > $maxruntime) {
+                if ($runtime > $this->maxruntime) {
                     
                     proc_terminate($p['proc'], 9);
                     //fclose($p['pipes'][1]);
@@ -431,10 +435,11 @@ class Pman_Core_Notify extends Pman
 
     function output()
     {
-        die("Done\n");
+        $this->logecho("DONE");
+        exit;
     }
     function logecho($str)
     {
-        echo date("Y-m-d H:i:s - $str\n");
+        echo date("Y-m-d H:i:s - ") . $str . "\n";
     }
 }
\ No newline at end of file