<?php
+if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
+ $directory = dirname($_SERVER["argv"][0]);
+
+ if (substr($directory, 0, 1) != "/")
+ $directory = $_SERVER["PWD"]."/".$directory;
+
+ $directory = realpath($directory."/..");
+
+ chdir($directory);
+}
require_once("boot.php");
if(function_exists('sys_getloadavg')) {
$load = sys_getloadavg();
if(intval($load[0]) > $maxsysload) {
- logger('system: load ' . $load . ' too high. Poller deferred to next scheduled run.');
+ logger('system: load ' . $load[0] . ' too high. Poller deferred to next scheduled run.');
return;
}
}
- $lockpath = get_config('system','lockpath');
+ $lockpath = get_lockpath();
if ($lockpath != '') {
$pidfile = new pidfile($lockpath, 'poller');
if($pidfile->is_already_running()) {
// expire any expired accounts
- q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0
- AND `account_expires_on` != '0000-00-00 00:00:00'
+ 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` < UTC_TIMESTAMP() ");
// delete user and contact records for recently removed accounts
$abandon_days = 0;
// Check OStatus conversations
- check_conversations();
+ // Check only conversations with mentions (for a longer time)
+ check_conversations(true);
+
+ // Check every conversation
+ check_conversations(false);
// To-Do: Regenerate usage statistics
// q("ANALYZE TABLE `item`");
// clear smarty cache
clear_cache($a->get_basepath()."/view/smarty3/compiled", $a->get_basepath()."/view/smarty3/compiled");
+ // clear cache for image proxy
+ if (!get_config("system", "proxy_disabled")) {
+ clear_cache($a->get_basepath(), $a->get_basepath()."/proxy");
+
+ $cachetime = get_config('system','proxy_cache_time');
+ if (!$cachetime) $cachetime = PROXY_DEFAULT_TIME;
+
+ q('DELETE FROM `photo` WHERE `uid` = 0 AND `resource-id` LIKE "pic:%%" AND `created` < NOW() - INTERVAL %d SECOND', $cachetime);
+ }
+
set_config('system','cache_last_cleared', time());
}
$manual_id = 0;
$generation = 0;
- $hub_update = false;
$force = false;
$restart = false;
}
$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')));
$sql_extra = (($manual_id) ? " AND `id` = $manual_id " : "");
proc_run('php','include/cronhooks.php');
// 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.
- $abandon_sql = (($abandon_days)
- ? sprintf(" AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days))
- : ''
+ $abandon_sql = (($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`
- WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
- AND NOT `network` IN ( '%s', '%s', '%s' )
- $sql_extra
- AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0
- AND `contact`.`archive` = 0
- AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 $abandon_sql ORDER BY RAND()",
+ $contacts = q("SELECT `contact`.`id` FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
+ WHERE `rel` IN (%d, %d) AND `poll` != '' AND `network` IN ('%s', '%s', '%s', '%s', '%s', '%s')
+ $sql_extra
+ AND NOT `self` AND NOT `contact`.`blocked` AND NOT `contact`.`readonly` AND NOT `contact`.`archive`
+ AND NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql ORDER BY RAND()",
intval(CONTACT_IS_SHARING),
intval(CONTACT_IS_FRIEND),
- dbesc(NETWORK_DIASPORA),
- dbesc(NETWORK_FACEBOOK),
- dbesc(NETWORK_PUMPIO)
+ dbesc(NETWORK_DFRN),
+ dbesc(NETWORK_ZOT),
+ dbesc(NETWORK_OSTATUS),
+ dbesc(NETWORK_FEED),
+ dbesc(NETWORK_MAIL),
+ dbesc(NETWORK_MAIL2)
);
if(! count($contacts)) {
if($manual_id)
$contact['last-update'] = '0000-00-00 00:00:00';
- if($contact['network'] === NETWORK_DFRN)
- $contact['priority'] = 2;
-
- if(!get_config('system','ostatus_use_priority') and ($contact['network'] === NETWORK_OSTATUS))
+ if(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'];
-
+ if($contact['subhub'] AND in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) {
// 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'.
+ // 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']) {
- $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;
+ if($contact['priority'] AND !$force) {
+
+ $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;
+ break;
case 4:
if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 week"))
$update = true;
$update = true;
break;
}
- if((! $update) && (! $force))
+ if(!$update)
continue;
}
+ logger("Polling ".$contact["network"]." ".$contact["id"]." ".$contact["nick"]." ".$contact["name"]);
+
proc_run('php','include/onepoll.php',$contact['id']);
+
if($interval)
@time_sleep_until(microtime(true) + (float) $interval);
}
}
+ logger('poller: end');
+
return;
}
if (array_search(__file__,get_included_files())===0){
- poller_run($argv,$argc);
+ poller_run($_SERVER["argv"],$_SERVER["argc"]);
killme();
}