<?php
require_once("boot.php");
require_once('include/queue_fn.php');
+require_once('include/dfrn.php');
function queue_run(&$argv, &$argc){
global $a, $db;
require_once("include/datetime.php");
require_once('include/items.php');
require_once('include/bbcode.php');
- require_once('include/pidfile.php');
+ require_once('include/socgraph.php');
load_config('config');
load_config('system');
- $lockpath = get_lockpath();
- if ($lockpath != '') {
- $pidfile = new pidfile($lockpath, 'queue');
- if($pidfile->is_already_running()) {
- logger("queue: Already running");
- if ($pidfile->running_time() > 9*60) {
- $pidfile->kill();
- logger("queue: killed stale process");
- // Calling a new instance
- proc_run('php',"include/queue.php");
- }
+ // 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'));
$queue_id = 0;
$deadguys = array();
+ $deadservers = array();
+ $serverlist = array();
logger('queue: start');
$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) {
else {
// For the first 12 hours we'll try to deliver every 15 minutes
- // After that, we'll only attempt delivery once per hour.
+ // 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 ))");
+ $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`");
}
if(! $r){
return;
foreach($r as $q_item) {
- // queue_predeliver hooks may have changed the queue db details,
+ // queue_predeliver hooks may have changed the queue db details,
// so check again if this entry still needs processing
if($queue_id) {
- $qi = q("select * from queue where `id` = %d limit 1",
+ $qi = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
intval($queue_id)
);
}
continue;
}
if(in_array($c[0]['notify'],$deadguys)) {
- logger('queue: skipping known dead url: ' . $c[0]['notify']);
- update_queue_time($q_item['id']);
- continue;
+ logger('queue: skipping known dead url: ' . $c[0]['notify']);
+ update_queue_time($q_item['id']);
+ continue;
+ }
+
+ $server = poco_detect_server($c[0]['url']);
+
+ if (($server != "") AND !in_array($server, $serverlist)) {
+ logger("Check server ".$server." (".$c[0]["network"].")");
+ if (!poco_check_server($server, $c[0]["network"], true))
+ $deadservers[] = $server;
+
+ $serverlist[] = $server;
}
- $u = q("SELECT `user`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`
+ if (($server != "") AND in_array($server, $deadservers)) {
+ logger('queue: skipping known dead server: '.$server);
+ update_queue_time($q_item['id']);
+ continue;
+ }
+
+ $u = q("SELECT `user`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`
FROM `user` WHERE `uid` = %d LIMIT 1",
intval($c[0]['uid'])
);
switch($contact['network']) {
case NETWORK_DFRN:
- logger('queue: dfrndelivery: item ' . $q_item['id'] . ' for ' . $contact['name']);
- $deliver_status = dfrn_deliver($owner,$contact,$data);
+ logger('queue: dfrndelivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>');
+ $deliver_status = dfrn::deliver($owner,$contact,$data);
if($deliver_status == (-1)) {
update_queue_time($q_item['id']);
$deadguys[] = $contact['notify'];
- }
- else {
+ } else
remove_queue_item($q_item['id']);
- }
+
break;
case NETWORK_OSTATUS:
if($contact['notify']) {
- logger('queue: slapdelivery: item ' . $q_item['id'] . ' for ' . $contact['name']);
+ logger('queue: slapdelivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>');
$deliver_status = slapper($owner,$contact['notify'],$data);
- if($deliver_status == (-1))
+ if($deliver_status == (-1)) {
update_queue_time($q_item['id']);
- else
+ $deadguys[] = $contact['notify'];
+ } else
remove_queue_item($q_item['id']);
}
break;
case NETWORK_DIASPORA:
if($contact['notify']) {
- logger('queue: diaspora_delivery: item ' . $q_item['id'] . ' for ' . $contact['name']);
- $deliver_status = diaspora_transmit($owner,$contact,$data,$public,true);
+ logger('queue: diaspora_delivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>');
+ $deliver_status = diaspora::transmit($owner,$contact,$data,$public,true);
- if($deliver_status == (-1))
+ if($deliver_status == (-1)) {
update_queue_time($q_item['id']);
- else
+ $deadguys[] = $contact['notify'];
+ } else
remove_queue_item($q_item['id']);
+
}
break;
call_hooks('queue_deliver', $a, $params);
if($params['result'])
- remove_queue_item($q_item['id']);
+ remove_queue_item($q_item['id']);
else
- update_queue_time($q_item['id']);
+ update_queue_time($q_item['id']);
break;
}
+ logger('Deliver status '.$deliver_status.' for item '.$q_item['id'].' to '.$contact['name'].' <'.$contact['url'].'>');
}
return;