friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #1410 from annando/1502-poller-issues 

Solving poller issues
This commit is contained in:
Tobias Diekershoff 2015-02-20 07:49:58 +01:00
parent 7e42315d9c dfdb804323
commit d026df3240
1 changed files with 33 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
include/poller.php
View File

@ -84,8 +84,8 @@ function poller_run(&$argv, &$argc){
// expire any expired accounts // expire any expired accounts
q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0 q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0
AND `account_expires_on` != '0000-00-00 00:00:00' AND `account_expires_on` != '0000-00-00 00:00:00'
AND `account_expires_on` < UTC_TIMESTAMP() "); AND `account_expires_on` < UTC_TIMESTAMP() ");
// delete user and contact records for recently removed accounts // delete user and contact records for recently removed accounts
@ -159,7 +159,6 @@ function poller_run(&$argv, &$argc){
$manual_id = 0; $manual_id = 0;
$generation = 0; $generation = 0;
$hub_update = false;
$force = false; $force = false;
$restart = false; $restart = false;
@ -179,7 +178,7 @@ function poller_run(&$argv, &$argc){
} }
$interval = intval(get_config('system','poll_interval')); $interval = intval(get_config('system','poll_interval'));
if(! $interval) if(! $interval)
$interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval'))); $interval = ((get_config('system','delivery_interval') === false) ? 3 : intval(get_config('system','delivery_interval')));
$sql_extra = (($manual_id) ? " AND `id` = $manual_id " : ""); $sql_extra = (($manual_id) ? " AND `id` = $manual_id " : "");
@ -192,26 +191,27 @@ function poller_run(&$argv, &$argc){
proc_run('php','include/cronhooks.php'); proc_run('php','include/cronhooks.php');
// Only poll from those with suitable relationships, // Only poll from those with suitable relationships,
// and which have a polling address and ignore Diaspora since // and which have a polling address and ignore Diaspora since
// we are unable to match those posts with a Diaspora GUID and prevent duplicates. // we are unable to match those posts with a Diaspora GUID and prevent duplicates.
$abandon_sql = (($abandon_days) $abandon_sql = (($abandon_days)
? sprintf(" AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days)) ? sprintf(" AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days))
: '' : ''
); );
$contacts = q("SELECT `contact`.`id` FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` $contacts = q("SELECT `contact`.`id` FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != '' WHERE `rel` IN (%d, %d) AND `poll` != '' AND `network` IN ('%s', '%s', '%s', '%s', '%s', '%s')
AND NOT `network` IN ( '%s', '%s', '%s' ) $sql_extra
$sql_extra AND NOT `self` AND NOT `contact`.`blocked` AND NOT `contact`.`readonly` AND NOT `contact`.`archive`
AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0 AND NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql ORDER BY RAND()",
AND `contact`.`archive` = 0
AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 $abandon_sql ORDER BY RAND()",
intval(CONTACT_IS_SHARING), intval(CONTACT_IS_SHARING),
intval(CONTACT_IS_FRIEND), intval(CONTACT_IS_FRIEND),
dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DFRN),
dbesc(NETWORK_FACEBOOK), dbesc(NETWORK_ZOT),
dbesc(NETWORK_PUMPIO) dbesc(NETWORK_OSTATUS),
dbesc(NETWORK_FEED),
dbesc(NETWORK_MAIL),
dbesc(NETWORK_MAIL2)
); );
if(! count($contacts)) { if(! count($contacts)) {
@ -234,35 +234,24 @@ function poller_run(&$argv, &$argc){
if($manual_id) if($manual_id)
$contact['last-update'] = '0000-00-00 00:00:00'; $contact['last-update'] = '0000-00-00 00:00:00';
if($contact['network'] === NETWORK_DFRN) if(in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS)))
$contact['priority'] = 2; $contact['priority'] = 2;
if(!get_config('system','ostatus_use_priority') and ($contact['network'] === NETWORK_OSTATUS)) if($contact['subhub'] AND in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) {
$contact['priority'] = 2;
if($contact['priority'] || $contact['subhub']) {
$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. // 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) // (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 // This also lets us update our subscription to the hub, and add or replace hubs in case it
// changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'. // changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'.
$poll_interval = get_config('system','pushpoll_frequency');
$contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
}
if($contact['subhub']) { if($contact['priority'] AND !$force) {
$poll_interval = get_config('system','pushpoll_frequency');
$contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
$hub_update = false;
if((datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) || $force) $update = false;
$hub_update = true;
} $t = $contact['last-update'];
else
$hub_update = false;
/** /**
* Based on $contact['priority'], should we poll this site now? Or later? * Based on $contact['priority'], should we poll this site now? Or later?
@ -291,22 +280,21 @@ function poller_run(&$argv, &$argc){
$update = true; $update = true;
break; break;
} }
if((! $update) && (! $force)) if(!$update)
continue; continue;
} }
// Don't run onepoll.php if the contact isn't pollable logger("Polling ".$contact["network"]." ".$contact["id"]." ".$contact["nick"]." ".$contact["name"]);
// This check also is inside the onepoll.php - but this will reduce the load
if (in_array($contact["rel"], array(CONTACT_IS_SHARING, CONTACT_IS_FRIEND)) AND ($contact["poll"] != "") proc_run('php','include/onepoll.php',$contact['id']);
AND !in_array($contact['network'], array(NETWORK_DIASPORA, NETWORK_FACEBOOK, NETWORK_PUMPIO, NETWORK_TWITTER, NETWORK_APPNET))
AND !$contact["self"] AND !$contact["blocked"] AND !$contact["readonly"] AND !$contact["archive"])
proc_run('php','include/onepoll.php',$contact['id']);
if($interval) if($interval)
@time_sleep_until(microtime(true) + (float) $interval); @time_sleep_until(microtime(true) + (float) $interval);
} }
} }
logger('poller: end');
return; return;
} }