DataObjects/Core_domain.php

[Pman.Core] / Notify.php

diff --git a/Notify.php b/Notify.php
index e7d5157..10f2419 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,
@@ -114,15 +114,13 @@ class Pman_Core_Notify extends Pman
         if (!$ff->cli) {
             die("access denied");
         }
-        $sig = $_SERVER["SCRIPT_NAME"] .'|'. __FILE__;
-        //echo "SIG: $sig\n";
-        HTML_FlexyFramework::ensureSingle($sig, $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']);
@@ -136,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..
         }
@@ -148,28 +144,41 @@ class Pman_Core_Notify extends Pman
         if (!empty($opts['send-to'])) {
             $this->send_to = $opts['send-to'];
         }
-     
-        
-        $w = DB_DataObject::factory('core_notify_recur');
-        if (is_a($w, 'DB_DataObject')) {
-            $w->generateNotifications();
-        }
+    }
+    
+    
+    function get($r,$opts)    
+    {
+        $this->parseArgs($opts); 
+         
+        //date_default_timezone_set('UTC');
+       // phpinfo();exit;
         if (!empty($opts['generate'])) {
             $w = DB_DataObject::factory($opts['generate']);
             if (is_a($w, 'DB_DataObject')) {
                 $w->generateNotifications();
             }
             exit;
-            
-            
         }
      
+     
+        
+        $w = DB_DataObject::factory('core_notify_recur');
+        if (is_a($w, 'DB_DataObject')) {
+            $w->generateNotifications();
+        }
+        
         //DB_DataObject::debugLevel(1);
         $w = DB_DataObject::factory($this->table);
+        $total = 0;
         
-        
-        if (!$showold) {
+        if (!empty($opts['old'])) {
+            // show old and new...
             
+            $w->orderBy('act_when DESC'); // latest first
+            $w->limit($opts['limit']); // we can run 
+            $total = min($w->count(), $opts['limit']);
+        } else {   
             // standard
             
             //$w->whereAdd('act_when > sent'); // eg.. sent is not valid..
@@ -181,32 +190,29 @@ class Pman_Core_Notify extends Pman
             }
     
             $w->orderBy('act_when ASC'); // oldest first.
+            $total = min($w->count(), $opts['limit']);
+            $this->logecho("QUEUE is {$w->count()} only running " . ((int) $opts['limit']));
             
-            $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;
         }
         
         $w->autoJoin();
+        $w->find();
         
-        
-        $ar = $w->fetchAll();
+        $ar = array(); // $w->fetchAll();
         
         if (!empty($opts['list'])) {
-            if (empty($ar)) {
-                die("Nothing in Queue\n");
-            }
-            foreach($ar as $w) {
+            
+            
+            while ($w->fetch()) { 
                 $o = $w->object();
                 
                 
-                $this->logecho("$w->id : $w->person_id_email email    : ".
+                $this->logecho("{$w->id} : {$w->person()->email} email    : ".
                         $o->toEventString()."    ". $w->status()  );
             }
             exit;
@@ -216,12 +222,15 @@ class Pman_Core_Notify extends Pman
         $pushed = array();
         $requeue = array();
         while (true) {
+            if ($w->fetch()) {
+                $ar[] = clone($w);
+                $total--;
+            }
             
-            
-            $this->logecho("BATCH SIZE: ".  count($ar) );
+            $this->logecho("BATCH SIZE: ".  (count($ar) + $total) );
             
             if (empty($ar)) {
-                $this->logecho("COMPLETED MAIN QUEUE - running delated");
+                $this->logecho("COMPLETED MAIN QUEUE - running deleted");
                 
                 if (empty($pushed)) {
                     break;
@@ -238,7 +247,7 @@ class Pman_Core_Notify extends Pman
                 sleep(3);
                 continue;
             }
-            if ($this->poolHasDomain($p->person_id_email) > $this->max_to_domain) {
+            if ($this->poolHasDomain($p->person()->email) > $this->max_to_domain) {
                 
                 if ($pushed === false) {
                     // we only try once to requeue..
@@ -253,7 +262,7 @@ class Pman_Core_Notify extends Pman
             }
             
             
-            $this->run($p->id,$p->person_id_email);
+            $this->run($p->id,$p->person()->email);
             
             
             
@@ -344,6 +353,7 @@ class Pman_Core_Notify extends Pman
                 'cmd' => $cmd,
                 'email' => $email,
                 'pipes' => $pipes,
+                'notify_id' => $id,
                 'started' => time()
             
                 
@@ -384,6 +394,14 @@ class Pman_Core_Notify extends Pman
                     $this->logecho("TERMINATING: ({$p['pid']}) " . $p['cmd'] . " : " . file_get_contents($p['out']));
                     @unlink($p['out']);
                     
+                    $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'));
+                    $w->update($ww);
+                    
+                    
                     continue;
                 }