<?php
+if (sizeof($_SERVER["argv"]) == 0)
+ die();
+
+$directory = dirname($_SERVER["argv"][0]);
+
+if (substr($directory, 0, 1) != "/")
+ $directory = $_SERVER["PWD"]."/".$directory;
+
+$directory = realpath($directory."/..");
+
+chdir($directory);
require_once("boot.php");
if(is_null($a)) {
$a = new App;
}
-
+
if(is_null($db)) {
@include(".htconfig.php");
- require_once("dba.php");
+ require_once("include/dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
};
}
}
- $lockpath = get_config('system','lockpath');
+ $lockpath = get_lockpath();
if ($lockpath != '') {
- $pidfile = new pidfile($lockpath, 'poller.lck');
+ $pidfile = new pidfile($lockpath, 'poller');
if($pidfile->is_already_running()) {
logger("poller: Already running");
+ if ($pidfile->running_time() > 9*60) {
+ $pidfile->kill();
+ logger("poller: killed stale process");
+ // Calling a new instance
+ proc_run('php','include/poller.php');
+ }
exit;
}
}
load_hooks();
logger('poller: start');
-
+
// run queue delivery process in the background
proc_run('php',"include/queue.php");
-
+
+ // run diaspora photo queue process in the background
+
+ proc_run('php',"include/dsprphotoq.php");
+
// 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'
AND `account_expires_on` < UTC_TIMESTAMP() ");
-
+
// delete user and contact records for recently removed accounts
$r = q("SELECT * FROM `user` WHERE `account_removed` = 1 AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
q("DELETE FROM `user` WHERE `uid` = %d", intval($user['uid']));
}
}
-
+
$abandon_days = intval(get_config('system','account_abandon_days'));
if($abandon_days < 1)
$abandon_days = 0;
-
+ // Check OStatus conversations
+ check_conversations();
+
+ // To-Do: Regenerate usage statistics
+ // q("ANALYZE TABLE `item`");
// once daily run birthday_updates and then expire in background
proc_run('php','include/expire.php');
}
- // clear old cache
- Cache::clear();
+ $last = get_config('system','cache_last_cleared');
- // clear old item cache files
- clear_cache();
+ if($last) {
+ $next = $last + (3600); // Once per hour
+ $clear_cache = ($next <= time());
+ } else
+ $clear_cache = true;
- // clear cache for photos
- clear_cache($a->get_basepath(), $a->get_basepath()."/photo");
+ if ($clear_cache) {
+ // clear old cache
+ Cache::clear();
+
+ // clear old item cache files
+ clear_cache();
+
+ // clear cache for photos
+ clear_cache($a->get_basepath(), $a->get_basepath()."/photo");
+
+ // 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;
: ''
);
- $contacts = q("SELECT `contact`.`id` FROM `contact` LEFT 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` != ''
- AND NOT `network` IN ( '%s', '%s' )
+ AND NOT `network` IN ( '%s', '%s', '%s' )
$sql_extra
AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0
AND `contact`.`archive` = 0
intval(CONTACT_IS_SHARING),
intval(CONTACT_IS_FRIEND),
dbesc(NETWORK_DIASPORA),
- dbesc(NETWORK_FACEBOOK)
+ dbesc(NETWORK_FACEBOOK),
+ dbesc(NETWORK_PUMPIO)
);
if(! count($contacts)) {
// 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'.
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;
}
/**
* 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;
continue;
}
- proc_run('php','include/onepoll.php',$contact['id']);
+ // Don't run onepoll.php if the contact isn't pollable
+ // 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"] != "")
+ 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)
@time_sleep_until(microtime(true) + (float) $interval);
}
}
if (array_search(__file__,get_included_files())===0){
- poller_run($argv,$argc);
+ poller_run($_SERVER["argv"],$_SERVER["argc"]);
killme();
}
projects / friendica.git / blobdiff