DataObjects/Core_domain.php

[Pman.Core] / Notify.php

diff --git a/Notify.php b/Notify.php
index 9eb892a..10f2419 100644 (file)
--- a/Notify.php
+++ b/Notify.php
@@ -153,32 +153,31 @@ class Pman_Core_Notify extends Pman
          
         //date_default_timezone_set('UTC');
        // phpinfo();exit;
-        
-     
-        
-        $w = DB_DataObject::factory('core_notify_recur');
-        if (is_a($w, 'DB_DataObject')) {
-            $w->generateNotifications();
-        }
         if (!empty($opts['generate'])) {
             $w = DB_DataObject::factory($opts['generate']);
             if (is_a($w, 'DB_DataObject')) {
                 $w->generateNotifications();
             }
             exit;
-            
-            
         }
      
-        DB_DataObject::debugLevel(1);
+     
+        
+        $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 (!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
             
@@ -191,8 +190,8 @@ class Pman_Core_Notify extends Pman
             }
     
             $w->orderBy('act_when ASC'); // oldest first.
-            
-            $this->logecho("QUEUE is {$w->count()}");
+            $total = min($w->count(), $opts['limit']);
+            $this->logecho("QUEUE is {$w->count()} only running " . ((int) $opts['limit']));
             
             $w->limit($opts['limit']); // we can run 1000 ...
         }
@@ -202,19 +201,18 @@ class Pman_Core_Notify extends Pman
         }
         
         $w->autoJoin();
+        $w->find();
         
+        $ar = array(); // $w->fetchAll();
         
-        $ar = $w->fetchAll();
-        print_r($ar);exit;
         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;
@@ -224,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;
@@ -246,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..
@@ -261,7 +262,7 @@ class Pman_Core_Notify extends Pman
             }
             
             
-            $this->run($p->id,$p->person_id_email);
+            $this->run($p->id,$p->person()->email);
             
             
             
@@ -352,6 +353,7 @@ class Pman_Core_Notify extends Pman
                 'cmd' => $cmd,
                 'email' => $email,
                 'pipes' => $pipes,
+                'notify_id' => $id,
                 'started' => time()
             
                 
@@ -392,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;
                 }