<?php
-
-
- require_once('boot.php');
-
- $a = new App;
-
- @include('.htconfig.php');
- require_once('dba.php');
- $db = new dba($db_host, $db_user, $db_pass, $db_data);
- unset($db_host, $db_user, $db_pass, $db_data);
+require_once("boot.php");
+
+function poller_run($argv, $argc){
+ global $a, $db;
+
+ if(is_null($a)){
+ $a = new App;
+ }
+
+ if(is_null($db)){
+ @include(".htconfig.php");
+ require_once("dba.php");
+ $db = new dba($db_host, $db_user, $db_pass, $db_data);
+ unset($db_host, $db_user, $db_pass, $db_data);
+ };
require_once('session.php');
require_once('datetime.php');
$a->set_baseurl(get_config('system','url'));
- $force = false;
+ 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_run($php_path,"include/queue.php");
+
+ // clear old cache
+ q("DELETE FROM `cache` WHERE `updated`<'%s'",
+ dbesc(datetime_convert('UTC','UTC',"now - 30 days")));
+
+ $manual_id = 0;
+ $hub_update = false;
+ $force = false;
+
if(($argc > 1) && ($argv[1] == 'force'))
$force = true;
+ if(($argc > 1) && intval($argv[1])) {
+ $manual_id = intval($argv[1]);
+ $force = true;
+ }
+
+ $sql_extra = (($manual_id) ? " AND `id` = $manual_id " : "");
+
// 'stat' clause is a temporary measure until we have federation subscriptions working both directions
$contacts = q("SELECT * FROM `contact`
WHERE ( ( `network` = 'dfrn' AND ( `dfrn-id` != '' OR (`issued-id` != '' AND `duplex` = 1)))
- OR ( `network` = 'stat' AND `poll` != '' ) )
+ OR ( `network` IN ( 'stat', 'feed' ) AND `poll` != '' ))
+ $sql_extra
AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()");
- if(! count($contacts))
- killme();
+ if(! count($contacts)){
+ return;
+ }
foreach($contacts as $contact) {
+ if($manual_id)
+ $contact['last-update'] = '0000-00-00 00:00:00';
+
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")) || $force)
+ $hub_update = true;
+ }
+
+
+ /**
+ * Based on $contact['priority'], should we poll this site now? Or later?
+ */
switch ($contact['priority']) {
case 5:
$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)
$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 ");
// 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;
}
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 {
$postvars = array();
- $sent_dfrn_id = hex2bin($res->dfrn_id);
- $challenge = hex2bin($res->challenge);
+ $sent_dfrn_id = hex2bin((string) $res->dfrn_id);
+ $challenge = hex2bin((string) $res->challenge);
$final_dfrn_id = '';
$xml = post_url($contact['poll'],$postvars);
}
else {
+
// $contact['network'] !== 'dfrn'
$xml = fetch_url($contact['poll']);
logger('poller: received xml : ' . $xml, LOGGER_DATA);
- if(! strlen($xml))
+ if(! strstr($xml,'<?xml')) {
+ logger('poller: post_handshake: 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;
+ }
+
+ 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);
+ consume_feed($xml,$importer,$contact,$hub,1);
- if((strlen($hub)) && (($contact['rel'] == REL_BUD) || (($contact['network'] === 'stat') && (! $contact['readonly'])))) {
+
+ 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)) {
}
- $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
- dbesc(datetime_convert()),
+ $updated = datetime_convert();
+
+ $r = q("UPDATE `contact` SET `last-update` = '%s', `success_update` = '%s' WHERE `id` = %d LIMIT 1",
+ dbesc($updated),
+ dbesc($updated),
intval($contact['id'])
);
// loop - next contact
}
- killme();
-
-
+ return;
+}
+if (array_search(__file__,get_included_files())===0){
+ poller_run($argv,$argc);
+ killme();
+}