|
|
|
|
@ -2,41 +2,16 @@
|
|
|
|
|
|
|
|
|
|
use \Friendica\Core\Config;
|
|
|
|
|
|
|
|
|
|
require_once("boot.php");
|
|
|
|
|
require_once('include/queue_fn.php');
|
|
|
|
|
require_once('include/dfrn.php');
|
|
|
|
|
require_once("include/datetime.php");
|
|
|
|
|
require_once('include/items.php');
|
|
|
|
|
require_once('include/bbcode.php');
|
|
|
|
|
require_once('include/socgraph.php');
|
|
|
|
|
require_once('include/cache.php');
|
|
|
|
|
|
|
|
|
|
function queue_run(&$argv, &$argc){
|
|
|
|
|
global $a, $db;
|
|
|
|
|
|
|
|
|
|
if (is_null($a)){
|
|
|
|
|
$a = new App;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (is_null($db)){
|
|
|
|
|
@include(".htconfig.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);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
require_once("include/session.php");
|
|
|
|
|
require_once("include/datetime.php");
|
|
|
|
|
require_once('include/items.php');
|
|
|
|
|
require_once('include/bbcode.php');
|
|
|
|
|
require_once('include/socgraph.php');
|
|
|
|
|
|
|
|
|
|
Config::load();
|
|
|
|
|
|
|
|
|
|
// Don't check this stuff if the function is called by the poller
|
|
|
|
|
if (App::callstack() != "poller_run")
|
|
|
|
|
if (App::is_already_running('queue', 'include/queue.php', 540))
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
$a->set_baseurl(get_config('system','url'));
|
|
|
|
|
|
|
|
|
|
load_hooks();
|
|
|
|
|
global $a;
|
|
|
|
|
|
|
|
|
|
if ($argc > 1) {
|
|
|
|
|
$queue_id = intval($argv[1]);
|
|
|
|
|
@ -54,30 +29,13 @@ function queue_run(&$argv, &$argc){
|
|
|
|
|
// Handling the pubsubhubbub requests
|
|
|
|
|
proc_run(PRIORITY_HIGH,'include/pubsubpublish.php');
|
|
|
|
|
|
|
|
|
|
$interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
|
|
|
|
|
|
|
|
|
|
// If we are using the worker we don't need a delivery interval
|
|
|
|
|
if (get_config("system", "worker"))
|
|
|
|
|
$interval = false;
|
|
|
|
|
|
|
|
|
|
$r = q("select * from deliverq where 1");
|
|
|
|
|
if ($r) {
|
|
|
|
|
foreach ($r as $rr) {
|
|
|
|
|
logger('queue: deliverq');
|
|
|
|
|
proc_run(PRIORITY_HIGH,'include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']);
|
|
|
|
|
if ($interval) {
|
|
|
|
|
time_sleep_until(microtime(true) + (float) $interval);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`
|
|
|
|
|
INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
|
|
|
|
|
WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
|
|
|
|
|
if ($r) {
|
|
|
|
|
foreach ($r as $rr) {
|
|
|
|
|
logger('Removing expired queue item for ' . $rr['name'] . ', uid=' . $rr['uid']);
|
|
|
|
|
logger('Expired queue data :' . $rr['content'], LOGGER_DATA);
|
|
|
|
|
logger('Expired queue data: ' . $rr['content'], LOGGER_DATA);
|
|
|
|
|
}
|
|
|
|
|
q("DELETE FROM `queue` WHERE `created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
|
|
|
|
|
}
|
|
|
|
|
@ -86,158 +44,137 @@ function queue_run(&$argv, &$argc){
|
|
|
|
|
// After that, we'll only attempt delivery once per hour.
|
|
|
|
|
|
|
|
|
|
$r = q("SELECT `id` FROM `queue` WHERE ((`created` > UTC_TIMESTAMP() - INTERVAL 12 HOUR && `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE) OR (`last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR)) ORDER BY `cid`, `created`");
|
|
|
|
|
} else {
|
|
|
|
|
logger('queue: start for id '.$queue_id);
|
|
|
|
|
|
|
|
|
|
$r = q("SELECT `id` FROM `queue` WHERE `id` = %d LIMIT 1",
|
|
|
|
|
intval($queue_id)
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
call_hooks('queue_predeliver', $a, $r);
|
|
|
|
|
|
|
|
|
|
if (!$r){
|
|
|
|
|
if (dbm::is_result($r)) {
|
|
|
|
|
foreach ($r as $q_item) {
|
|
|
|
|
logger('Call queue for id '.$q_item['id']);
|
|
|
|
|
proc_run(PRIORITY_LOW, "include/queue.php", $q_item['id']);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!$queue_id)
|
|
|
|
|
call_hooks('queue_predeliver', $a, $r);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// delivery loop
|
|
|
|
|
// delivering
|
|
|
|
|
|
|
|
|
|
require_once('include/salmon.php');
|
|
|
|
|
require_once('include/diaspora.php');
|
|
|
|
|
|
|
|
|
|
foreach($r as $q_item) {
|
|
|
|
|
|
|
|
|
|
// queue_predeliver hooks may have changed the queue db details,
|
|
|
|
|
// so check again if this entry still needs processing
|
|
|
|
|
$r = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
|
|
|
|
|
intval($queue_id));
|
|
|
|
|
|
|
|
|
|
if ($queue_id) {
|
|
|
|
|
$qi = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
|
|
|
|
|
intval($queue_id));
|
|
|
|
|
} elseif (get_config("system", "worker")) {
|
|
|
|
|
logger('Call queue for id '.$q_item['id']);
|
|
|
|
|
proc_run(PRIORITY_LOW, "include/queue.php", $q_item['id']);
|
|
|
|
|
continue;
|
|
|
|
|
} else
|
|
|
|
|
$qi = q("SELECT * FROM `queue` WHERE `id` = %d AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ",
|
|
|
|
|
intval($q_item['id']));
|
|
|
|
|
|
|
|
|
|
if (!dbm::is_result($qi)) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (!dbm::is_result($r)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$q_item = $r[0];
|
|
|
|
|
|
|
|
|
|
$c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
|
|
|
|
|
intval($qi[0]['cid'])
|
|
|
|
|
);
|
|
|
|
|
if (! dbm::is_result($c)) {
|
|
|
|
|
remove_queue_item($q_item['id']);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
$c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
|
|
|
|
|
intval($q_item['cid'])
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
$dead = Cache::get($cachekey_deadguy.$c[0]['notify']);
|
|
|
|
|
if (!dbm::is_result($c)) {
|
|
|
|
|
remove_queue_item($q_item['id']);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!is_null($dead) AND $dead) {
|
|
|
|
|
logger('queue: skipping known dead url: '.$c[0]['notify']);
|
|
|
|
|
update_queue_time($q_item['id']);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
$dead = Cache::get($cachekey_deadguy.$c[0]['notify']);
|
|
|
|
|
|
|
|
|
|
$server = poco_detect_server($c[0]['url']);
|
|
|
|
|
if (!is_null($dead) AND $dead) {
|
|
|
|
|
logger('queue: skipping known dead url: '.$c[0]['notify']);
|
|
|
|
|
update_queue_time($q_item['id']);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ($server != "") {
|
|
|
|
|
$vital = Cache::get($cachekey_server.$server);
|
|
|
|
|
$server = poco_detect_server($c[0]['url']);
|
|
|
|
|
|
|
|
|
|
if (is_null($vital)) {
|
|
|
|
|
logger("Check server ".$server." (".$c[0]["network"].")");
|
|
|
|
|
if ($server != "") {
|
|
|
|
|
$vital = Cache::get($cachekey_server.$server);
|
|
|
|
|
|
|
|
|
|
$vital = poco_check_server($server, $c[0]["network"], true);
|
|
|
|
|
Cache::set($cachekey_server.$server, $vital, CACHE_QUARTER_HOUR);
|
|
|
|
|
}
|
|
|
|
|
if (is_null($vital)) {
|
|
|
|
|
logger("Check server ".$server." (".$c[0]["network"].")");
|
|
|
|
|
|
|
|
|
|
if (!is_null($vital) AND !$vital) {
|
|
|
|
|
logger('queue: skipping dead server: '.$server);
|
|
|
|
|
update_queue_time($q_item['id']);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
$vital = poco_check_server($server, $c[0]["network"], true);
|
|
|
|
|
Cache::set($cachekey_server.$server, $vital, CACHE_QUARTER_HOUR);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$u = q("SELECT `user`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`
|
|
|
|
|
FROM `user` WHERE `uid` = %d LIMIT 1",
|
|
|
|
|
