Merge branch 'fabrixxm-master'

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index b9a4f22347821fba2ad39c76e93c1ece6ac605be..3d13a54808d161b8c96ab26fabb790941ff9a701 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -18,6 +18,14 @@
 
        $a->set_baseurl(get_config('system','url'));
 
+       logger('poller: start');
+
+       // run queue delivery process in the background
+
+       $php_path = ((x($a->config,'php_path') && strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+       proc_close(proc_open("\"$php_path\" \"include/queue.php\" &", array(), $foo));
+
+
        $force = false;
        if(($argc > 1) && ($argv[1] == 'force'))
                $force = true;
@@ -35,16 +43,30 @@
 
                if($contact['priority'] || $contact['subhub']) {
 
-                       $update = false;
+                       $hub_update = true;
+                       $update     = false;
+
+                       $t = $contact['last-update'];
 
                        // We should be getting everything via a hub. But just to be sure, let's check once a day.
+                       // (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately)
                        // This also lets us update our subscription to the hub, and add or replace hubs in case it
-                       // changed. 
+                       // changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'. 
 
-                       if($contact['subhub'])
-                               $contact['priority'] = 3;
 
-                       $t = $contact['last-update'];
+                       if($contact['subhub']) {
+                               $interval = get_config('system','pushpoll_frequency');
+                               $contact['priority'] = (($interval !== false) ? intval($interval) : 3);
+                               $hub_update = false;
+
+                               if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day"))
+                                               $hub_update = true;
+                       }
+
+
+                       /**
+                        * Based on $contact['priority'], should we poll this site now? Or later?
+                        */                     
 
                        switch ($contact['priority']) {
                                case 5:
@@ -83,7 +105,7 @@
 
                $importer = $r[0];
 
-               logger("poller: IMPORTER: {$importer['name']}");
+               logger("poller: poll: IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}");
 
                $last_update = (($contact['last-update'] === '0000-00-00 00:00:00') 
                        ? datetime_convert('UTC','UTC','now - 30 days', ATOM_TIME)
@@ -105,7 +127,8 @@
        
                        $xml = fetch_url($url);
 
-                       logger('poller: handshake with url ' . $url . ' returns xml: ' . $xml);
+                       logger('poller: handshake with url ' . $url . ' returns xml: ' . $xml, LOGGER_DATA);
+
 
                        if(! $xml) {
                                logger("poller: $url appears to be dead - marking for death ");
@@ -113,6 +136,23 @@
                                // mean the software was uninstalled or the domain expired. 
                                // Will keep trying for one month.
                                mark_for_death($contact);
+
+                               // set the last-update so we don't keep polling
+
+                               $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
+                                       dbesc(datetime_convert()),
+                                       intval($contact['id'])
+                               );
+
+                               continue;
+                       }
+
+                       if(! strstr($xml,'<?xml')) {
+                               logger('poller: response from ' . $url . ' did not contain XML.');
+                               $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
+                                       dbesc(datetime_convert()),
+                                       intval($contact['id'])
+                               );
                                continue;
                        }
 
@@ -121,7 +161,15 @@
 
                        if(intval($res->status) == 1) {
                                logger("poller: $url replied status 1 - marking for death ");
+
                                // we may not be friends anymore. Will keep trying for one month.
+                               // set the last-update so we don't keep polling
+
+                               $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
+                                       dbesc(datetime_convert()),
+                                       intval($contact['id'])
+                               );
+
                                mark_for_death($contact);
                        }
                        else {
@@ -177,10 +225,16 @@
                if(! strlen($xml))
                        continue;
 
-               consume_feed($xml,$importer,$contact,$hub);
+               consume_feed($xml,$importer,$contact,$hub,1);
+
+               // do it twice. Ensures that children of parents which may be later in the stream aren't tossed
+
+               consume_feed($xml,$importer,$contact,$hub,1);
+
 
-               if((strlen($hub)) && (($contact['rel'] == REL_BUD) || (($contact['network'] === 'stat') && (! $contact['readonly'])))) {
-                       logger('poller: subscribing to hub(s) : ' . $hubs . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
+               if((strlen($hub)) && ($hub_update) 
+                       && (($contact['rel'] == REL_BUD) || (($contact['network'] === 'stat') && (! $contact['readonly'])))) {
+                       logger('poller: subscribing to hub(s) : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
                        $hubs = explode(',', $hub);
                        if(count($hubs)) {
                                foreach($hubs as $h) {