harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

progress on poller

Browse Source
This commit is contained in:
friendica 2012-12-30 16:14:29 -08:00
parent 8eee37e1fa
commit 14fb503800
2 changed files with 68 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
include/onepoll.php
View File

@ -1,37 +1,14 @@
<?php <?php
require_once("boot.php"); require_once('boot.php');
require_once('include/cli_startup.php');
function onepoll_run($argv, $argc){ function onepoll_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('include/session.php'); cli_startup();
require_once('include/datetime.php'); $a = get_app();
require_once('library/simplepie/simplepie.inc');
require_once('include/items.php');
require_once('include/Contact.php');
require_once('include/email.php');
require_once('include/socgraph.php');
require_once('include/queue_fn.php');
load_config('config');
load_config('system');
$a->set_baseurl(get_config('system','baseurl'));
load_hooks();
logger('onepoll: start'); logger('onepoll: start');
@ -52,27 +29,41 @@ function onepoll_run($argv, $argc){
$d = datetime_convert(); $d = datetime_convert();
// Only poll from those with suitable relationships,
$contacts = q("SELECT `contact`.* FROM `contact`
WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != '' // FIXME
AND `contact`.`id` = %d return;
AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0
AND `contact`.`archive` = 0 LIMIT 1",
intval(CONTACT_IS_SHARING),
intval(CONTACT_IS_FRIEND), $contacts = q("SELECT abook.*, account.*
intval($contact_id) FROM abook LEFT JOIN account on abook_account = account_id
AND abook_id = %d
AND not ( abook_flags & %d ) AND not ( abook_flags & %d )
AND not ( abook_flags & %d ) AND not ( abook_flags & %d )
AND not ( abook_flags & %d ) AND ( account_flags & %d ) $abandon_sql ORDER BY RAND()",
intval($contact_id),
intval(ABOOK_FLAG_BLOCKED),
intval(ABOOK_FLAG_IGNORED),
intval(ABOOK_FLAG_PENDING),
intval(ABOOK_FLAG_ARCHIVED),
intval(ABOOK_FLAG_SELF),
intval(ACCOUNT_OK)
); );
if(! count($contacts)) { if(! $contacts) {
return; return;
} }
if(! $contacts)
return;
$contact = $contacts[0]; $contact = $contacts[0];
$t = $contact['abook_updated'];
$xml = false;
$t = $contact['last_update']; // end of last edits
$importer_uid = $contact['uid']; $importer_uid = $contact['uid'];

158
include/poller.php
View File

@ -1,32 +1,14 @@
<?php <?php
require_once("boot.php"); require_once('boot.php');
require_once('include/cli_startup.php');
function poller_run($argv, $argc){ function poller_run($argv, $argc){
global $a, $db;
if(is_null($a)) { cli_startup();
$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);
};
$a = get_app();
require_once('include/session.php');
require_once('include/datetime.php');
require_once('library/simplepie/simplepie.inc');
require_once('include/items.php');
require_once('include/Contact.php');
require_once('include/socgraph.php');
load_config('config');
load_config('system');
$maxsysload = intval(get_config('system','maxloadavg')); $maxsysload = intval(get_config('system','maxloadavg'));
if($maxsysload < 1) if($maxsysload < 1)
@ -39,11 +21,6 @@ function poller_run($argv, $argc){
} }
} }
$a->set_baseurl(get_config('system','baseurl'));
load_hooks();
logger('poller: start'); logger('poller: start');
// run queue delivery process in the background // run queue delivery process in the background
@ -66,7 +43,6 @@ function poller_run($argv, $argc){
$abandon_days = 0; $abandon_days = 0;
// once daily run birthday_updates and then expire in background // once daily run birthday_updates and then expire in background
$d1 = get_config('system','last_expire_day'); $d1 = get_config('system','last_expire_day');
@ -80,21 +56,6 @@ function poller_run($argv, $argc){
proc_run('php','include/expire.php'); proc_run('php','include/expire.php');
} }
// clear old cache
Cache::clear();
// clear item cache files if they are older than one day
$cache = get_config('system','itemcache');
if (($cache != '') and is_dir($cache)) {
if ($dh = opendir($cache)) {
while (($file = readdir($dh)) !== false) {
$fullpath = $cache."/".$file;
if ((filetype($fullpath) == "file") and filectime($fullpath) < (time() - 86400))
unlink($fullpath);
}
closedir($dh);
}
}
$manual_id = 0; $manual_id = 0;
$generation = 0; $generation = 0;
@ -102,18 +63,18 @@ function poller_run($argv, $argc){
$force = false; $force = false;
$restart = false; $restart = false;
if(($argc > 1) && ($argv[1] == 'force')) if((argc() > 1) && (argv(1) == 'force'))
$force = true; $force = true;
if(($argc > 1) && ($argv[1] == 'restart')) { if((argc() > 1) && (argv(1) == 'restart')) {
$restart = true; $restart = true;
$generation = intval($argv[2]); $generation = intval(argv(2));
if(! $generation) if(! $generation)
killme(); killme();
} }
if(($argc > 1) && intval($argv[1])) { if((argc() > 1) && intval(argv(1))) {
$manual_id = intval($argv[1]); $manual_id = intval(argv(1));
$force = true; $force = true;
} }
@ -121,12 +82,14 @@ function poller_run($argv, $argc){
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 abook_id = $manual_id " : "");
reload_plugins(); reload_plugins();
$d = datetime_convert(); $d = datetime_convert();
//TODO check to see if there are any cronhooks before wasting a process
if(! $restart) if(! $restart)
proc_run('php','include/cronhooks.php'); proc_run('php','include/cronhooks.php');
@ -135,93 +98,46 @@ function poller_run($argv, $argc){
// 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 account_lastlog > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days))
: '' : ''
); );
// FIXME $contacts = q("SELECT abook_id, abook_updated, abook_closeness, abook_channel
return; FROM abook LEFT JOIN account on abook_account = account_id
$contacts = q("SELECT `contact`.`id` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid`
WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
AND NOT `network` IN ( '%s', '%s' )
$sql_extra $sql_extra
AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0 AND not ( abook_flags & %d ) AND not ( abook_flags & %d )
AND `contact`.`archive` = 0 AND not ( abook_flags & %d ) AND not ( abook_flags & %d )
AND `user`.`account_expired` = 0 $abandon_sql ORDER BY RAND()", AND not ( abook_flags & %d ) AND ( account_flags & %d ) $abandon_sql ORDER BY RAND()",
intval(CONTACT_IS_SHARING),
intval(CONTACT_IS_FRIEND), intval(ABOOK_FLAG_BLOCKED),
dbesc(NETWORK_DIASPORA), intval(ABOOK_FLAG_IGNORED),
dbesc(NETWORK_FACEBOOK) intval(ABOOK_FLAG_PENDING),
intval(ABOOK_FLAG_ARCHIVED),
intval(ABOOK_FLAG_SELF),
intval(ACCOUNT_OK)
); );
if(! count($contacts)) { if(! $contacts) {
return; return;
} }
foreach($contacts as $c) { foreach($contacts as $contact) {
$res = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", $update = false;
intval($c['id'])
);
if((! $res) || (! count($res))) $t = $contact['abook_updated'];
continue;
foreach($res as $contact) { if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day"))
$update = true;
$xml = false; if((! $update) && (! $force))
continue;
if($manual_id) proc_run('php','include/onepoll.php',$contact['abook_id']);
$contact['last_update'] = '0000-00-00 00:00:00'; if($interval)
@time_sleep_until(microtime(true) + (float) $interval);
if($contact['network'] === NETWORK_DFRN)
$contact['priority'] = 2;
if(!get_config('system','ostatus_use_priority') and ($contact['network'] === NETWORK_OSTATUS))
$contact['priority'] = 2;
if($contact['priority']) {
$update = false;
$t = $contact['last_update'];
/**
* Based on $contact['priority'], should we poll this site now? Or later?
*/
switch ($contact['priority']) {
case 5:
if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 month"))
$update = true;
break;
case 4:
if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 week"))
$update = true;
break;
case 3:
if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day"))
$update = true;
break;
case 2:
if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 12 hour"))
$update = true;
break;
case 1:
default:
if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 hour"))
$update = true;
break;
}
if((! $update) && (! $force))
continue;
}
proc_run('php','include/onepoll.php',$contact['id']);
if($interval)
@time_sleep_until(microtime(true) + (float) $interval);
}
} }
return; return;