DataObjects/Core_image_type.php

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index 47c6668..2f6c4e9 100644 (file)
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -2,12 +2,22 @@
 require_once 'Pman.php';
 
 /**
- * notification script runner
+ * notification script sender - designed to be run by the Notify script - with many children running
+ * in parallel.
  *
- * This does not actualy send stuf out, it only starts the NotifySend/{id}
- * which does the actuall notifcations.
+ * called with an id of a core_notify element
  *
- * It manages a pool of notifiers.
+ * uses core_notify - to find an event to object and person.
+ *
+ * uses Events table to log failures
+ * 
+ * 
+ * calls $object->toEmail($person,$last_send) to generate an email struct with
+ *  array (
+ *      headers =>
+ *      recipients =>
+ *      body =>
+ *  )
  * 
  * 
  */
@@ -32,14 +42,14 @@ class Pman_Core_NotifySend extends Pman
     
     function get($id)    
     {
-        DB_DataObject::debugLevel(1);
+        //DB_DataObject::debugLevel(1);
         //date_default_timezone_set('UTC');
         // phpinfo();exit;
         
         $w = DB_DataObject::factory($this->table);
         
         if (!$w->get($id) || strtotime($w->act_when) < strtotime($w->sent)) {
-            die("invalid id or time");
+            die("invalid id or time\n");
         }
          
         $o = $w->object();
@@ -74,19 +84,22 @@ class Pman_Core_NotifySend extends Pman
         
         
         $email = $o->toEmail($p,$last);
+        
+        //$p->email = 'alan@akbkhome.com'; //for testing..
+        //print_r($email);exit;
         // should we fetch the watch that caused it.. - which should contain the method to call..
         $dom = array_pop(explode('@', $p->email));
         
         $mxs = $this->mxs($dom);
         $ww = clone($w);
         
-        
-        
+        $fail = false;
+        require_once 'Mail.php';
         
         foreach($mxs as $dom) {
             
             $mailer = Mail::factory('smtp', array( 'host'         => $dom ));
-            $res = $mailer->send($email['recipients'], $email['headers'], $email['body']);
+            $res = $mailer->send($p->email, $email['headers'], $email['body']);
             if ($res === true) {
                 // success....
                 
@@ -94,7 +107,7 @@ class Pman_Core_NotifySend extends Pman
                 $w->msgid = $email['headers']['Message-Id'];
                 $w->event_id = -1; // sent ok.. - no need to record it..
                 $w->update($ww);
-                die("SENT");
+                die(date('Y-m-d h:i:s') . " - SENT");
             }
             // what type of error..
             list($code, $response) = $mailer->_smtp->getResponse();
@@ -102,27 +115,31 @@ class Pman_Core_NotifySend extends Pman
                 continue; // try next mx... ??? should we wait??? - nope we did not even connect..
             }
             // give up after 2 days..
-            if ($code == 451 || $next_try_min > (2*24*60)) {
+            if ($code == 451 && $next_try_min < (2*24*60)) {
                 // try again later..
                 // check last event for this item..
                 $this->addEvent('NOTIFY', $w, 'GREYLISTED');
                 $w->act_when = date('Y-m-d H:i:s', strtotime('NOW + 5 MINUTES'));
                 $w->update($ww);
-                die("GREYLISTED");
+                die(date('Y-m-d h:i:s') . " - GREYLISTED");
             }
-            // fail.. = log and give up..
-            $id = $this->addEvent('NOTIFY', $w, 'FAILED - '. $res->toString());
+            $fail = true;
+            break;
+        }
+        if ($fail || $next_try_min > (2*24*60)) {
+        // fail.. = log and give up..
+            $id = $this->addEvent('NOTIFY', $w, 'FAILED - '. $fail ? $res->toString() : "RETRY TIME EXCEEDED");
             $w->sent = date('Y-m-d H:i:s');
             $w->msgid = '';
             $w->event_id = $id;
             $w->update($ww);
-            die("DONE");
+            die(date('Y-m-d h:i:s') . " - DONE");
         }
         
         $this->addEvent('NOTIFY', $w, 'NO HOST CAN BE CONTACTED');
         $w->act_when = date('Y-m-d H:i:s', strtotime('NOW + 5 MINUTES'));
         $w->update($ww);
-        die("NO HOST AVAILABLE");
+        die(date('Y-m-d h:i:s') ." - NO HOST AVAILABLE");
 
         
     }
@@ -132,12 +149,12 @@ class Pman_Core_NotifySend extends Pman
         $mx_weight = array();
         $mxs = array();
         if (!getmxrr($fqdn, $mx_records, $mx_weight)) {
-            return araray($fqdn);
+            return array($fqdn);
         }
         
         asort($mx_weight,SORT_NUMERIC);
         
-        forach($mx_weight as $k => $weight) {
+        foreach($mx_weight as $k => $weight) {
             $mxs[] = $mx_records[$k];
         }
         return $mxs;