more DB cleanup

This commit is contained in:
friendica
2012-08-30 18:47:07 -07:00
parent 08508c4216
commit 80bd128425
29 changed files with 183 additions and 277 deletions

View File

@@ -107,7 +107,7 @@ function poller_run($argv, $argc){
$manual_id = 0;
$generation = 0;
$hub_update = false;
$force = false;
$restart = false;
@@ -179,7 +179,7 @@ function poller_run($argv, $argc){
$xml = false;
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)
$contact['priority'] = 2;
@@ -187,29 +187,11 @@ function poller_run($argv, $argc){
if(!get_config('system','ostatus_use_priority') and ($contact['network'] === NETWORK_OSTATUS))
$contact['priority'] = 2;
if($contact['priority'] || $contact['subhub']) {
if($contact['priority']) {
$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. We will only update hubs once a day, regardless of 'pushpoll_frequency'.
if($contact['subhub']) {
$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)
$hub_update = true;
}
else
$hub_update = false;
$t = $contact['last_update'];
/**
* Based on $contact['priority'], should we poll this site now? Or later?