Notify.php

[Pman.Core] / Notify.php

diff --git a/Notify.php b/Notify.php
index 8d13d28..8fe8d77 100644 (file)
--- a/Notify.php
+++ b/Notify.php
@@ -42,7 +42,7 @@ class Pman_Core_Notify extends Pman
             
         ),
         'old' => array(
-            'desc' => 'Show old messages..',
+            'desc' => 'Show old messages.. (and new messages...)',
             'default' => 0,
             'short' => 'o',
             'min' => 0,
@@ -101,7 +101,8 @@ class Pman_Core_Notify extends Pman
     /**
      * @var $maxruntime - maximum time a child is allowed to run - defaut 2 minutes
      */
-    var $maxruntime = 120; 
+    var $maxruntime = 120;
+    
     var $table = 'core_notify';
     var $target = 'Core/NotifySend';
     var $evtype = ''; // any notification...
@@ -113,14 +114,13 @@ class Pman_Core_Notify extends Pman
         if (!$ff->cli) {
             die("access denied");
         }
-        HTML_FlexyFramework::ensureSingle(__FILE__, $this);
+        HTML_FlexyFramework::ensureSingle($_SERVER["SCRIPT_NAME"] .'|'. __FILE__, $this);
         return true;
-        
     }
     
     var $pool = array();
     
-    function get($r,$opts)    
+    function parseArgs(&$opts)
     {
         if ($opts['debug']) {
             DB_DataObject::debugLevel($opts['debug']);
@@ -134,9 +134,7 @@ class Pman_Core_Notify extends Pman
         if (empty($opts['limit'])) {
             $opts['limit'] = '1000'; // not sure why it's not picking up the defautl..
         }
-        //date_default_timezone_set('UTC');
-       // phpinfo();exit;
-        $showold = !empty($opts['old']);
+        
         if (!empty($opts['old'])) {
             $opts['list'] = 1; // force listing..
         }
@@ -146,6 +144,16 @@ class Pman_Core_Notify extends Pman
         if (!empty($opts['send-to'])) {
             $this->send_to = $opts['send-to'];
         }
+    }
+    
+    
+    function get($r,$opts)    
+    {
+        $this->parseArgs($opts); 
+         
+        //date_default_timezone_set('UTC');
+       // phpinfo();exit;
+        
      
         
         $w = DB_DataObject::factory('core_notify_recur');
@@ -165,9 +173,13 @@ class Pman_Core_Notify extends Pman
         //DB_DataObject::debugLevel(1);
         $w = DB_DataObject::factory($this->table);
         
-        
-        if (!$showold) {
+        if (!empty($opts['old'])) {
+            // show old and new...
+            
+            $w->orderBy('act_when DESC'); // latest first
+            $w->limit($opts['limit']); // we can run 
             
+        } else {   
             // standard
             
             //$w->whereAdd('act_when > sent'); // eg.. sent is not valid..
@@ -182,11 +194,9 @@ class Pman_Core_Notify extends Pman
             
             $this->logecho("QUEUE is {$w->count()}");
             
-            $w->limit($opts['limit']); // we can run 1000 ...
-        } else {
-            $w->orderBy('act_when DESC'); // latest first
             $w->limit($opts['limit']); // we can run 1000 ...
         }
+        
         if (!empty($this->evtype)) {
             $w->evtype = $this->evtype;
         }
@@ -303,6 +313,7 @@ class Pman_Core_Notify extends Pman
         $sn =  $_SERVER["SCRIPT_NAME"];
         
         $cwd = $sn[0] == '/' ? dirname($sn) : dirname(realpath(getcwd() . '/'. $sn)); // same as run on.. (so script should end up being same relatively..)
+        print_R($cwd);exit;
         $app = $cwd . '/' . basename($_SERVER["SCRIPT_NAME"]) . '  ' . $this->target . '/'. $id;
         if ($this->force) {
             $app .= ' -f';
@@ -353,8 +364,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";
@@ -374,7 +384,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]);