/**
* @file src/Worker/Queue.php
*/
-
namespace Friendica\Worker;
+use Friendica\Core\Addon;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
-use Friendica\Protocol\Diaspora;
+use Friendica\Model\Queue as QueueModel;
use Friendica\Protocol\DFRN;
+use Friendica\Protocol\Diaspora;
use Friendica\Protocol\PortableContact;
+use Friendica\Protocol\Salmon;
+use dba;
-require_once 'include/queue_fn.php';
-require_once 'include/datetime.php';
+require_once 'include/dba.php';
require_once 'include/items.php';
-require_once 'include/bbcode.php';
-require_once 'include/salmon.php';
-class Queue {
+class Queue
+{
public static function execute($queue_id = 0)
{
global $a;
$cachekey_deadguy = 'queue_run:deadguy:';
$cachekey_server = 'queue_run:server:';
+ $no_dead_check = Config::get('system', 'queue_no_dead_check', false);
+
if (!$queue_id) {
- logger('queue: start');
+ logger('filling queue jobs - start');
// Handling the pubsubhubbub requests
- Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'PubSubPublish');
-
- $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 (DBM::is_result($r)) {
- foreach ($r as $rr) {
- logger('Removing expired queue item for ' . $rr['name'] . ', uid=' . $rr['uid']);
- logger('Expired queue data: ' . $rr['content'], LOGGER_DATA);
- }
- q("DELETE FROM `queue` WHERE `created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
- }
+ Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], 'PubSubPublish');
- /*
- * For the first 12 hours we'll try to deliver every 15 minutes
- * After that, we'll only attempt delivery once per hour.
- */
- $r = q("SELECT `id` FROM `queue` WHERE ((`created` > UTC_TIMESTAMP() - INTERVAL 12 HOUR AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE) OR (`last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR)) ORDER BY `cid`, `created`");
+ $r = dba::inArray(dba::p("SELECT `id` FROM `queue` WHERE `next` < UTC_TIMESTAMP()"));
- call_hooks('queue_predeliver', $a, $r);
+ Addon::callHooks('queue_predeliver', $r);
if (DBM::is_result($r)) {
foreach ($r as $q_item) {
- logger('Call queue for id '.$q_item['id']);
- Worker::add(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "Queue", (int)$q_item['id']);
+ logger('Call queue for id ' . $q_item['id']);
+ Worker::add(['priority' => PRIORITY_LOW, 'dont_fork' => true], "Queue", (int) $q_item['id']);
}
}
+ logger('filling queue jobs - end');
return;
}
// delivering
-
- $r = q(
- "SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
- intval($queue_id)
- );
-
- if (!DBM::is_result($r)) {
+ $q_item = dba::selectFirst('queue', [], ['id' => $queue_id]);
+ if (!DBM::is_result($q_item)) {
return;
}
- $q_item = $r[0];
-
- $c = q(
- "SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
- intval($q_item['cid'])
- );
-
- if (!DBM::is_result($c)) {
- remove_queue_item($q_item['id']);
+ $contact = dba::selectFirst('contact', [], ['id' => $q_item['cid']]);
+ if (!DBM::is_result($contact)) {
+ QueueModel::removeItem($q_item['id']);
return;
}
- $dead = Cache::get($cachekey_deadguy.$c[0]['notify']);
+ $dead = Cache::get($cachekey_deadguy . $contact['notify']);
- if (!is_null($dead) && $dead) {
- logger('queue: skipping known dead url: '.$c[0]['notify']);
- update_queue_time($q_item['id']);
+ if (!is_null($dead) && $dead && !$no_dead_check) {
+ logger('queue: skipping known dead url: ' . $contact['notify']);
+ QueueModel::updateTime($q_item['id']);
return;
}
- $server = PortableContact::detectServer($c[0]['url']);
+ if (!$no_dead_check) {
+ $server = PortableContact::detectServer($contact['url']);
- if ($server != "") {
- $vital = Cache::get($cachekey_server.$server);
+ if ($server != "") {
+ $vital = Cache::get($cachekey_server . $server);
- if (is_null($vital)) {
- logger("Check server ".$server." (".$c[0]["network"].")");
+ if (is_null($vital)) {
+ logger("Check server " . $server . " (" . $contact["network"] . ")");
- $vital = PortableContact::checkServer($server, $c[0]["network"], true);
- Cache::set($cachekey_server.$server, $vital, CACHE_QUARTER_HOUR);
- }
+ $vital = PortableContact::checkServer($server, $contact["network"], true);
+ Cache::set($cachekey_server . $server, $vital, CACHE_QUARTER_HOUR);
+ }
- if (!is_null($vital) && !$vital) {
- logger('queue: skipping dead server: '.$server);
- update_queue_time($q_item['id']);
- return;
+ if (!is_null($vital) && !$vital) {
+ logger('queue: skipping dead server: ' . $server);
+ QueueModel::updateTime($q_item['id']);
+ return;
+ }
}
}
- $u = q(
- "SELECT `user`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`
- FROM `user` WHERE `uid` = %d LIMIT 1",
- intval($c[0]['uid'])
- );
- if (!DBM::is_result($u)) {
- remove_queue_item($q_item['id']);
+ $user = dba::selectFirst('user', [], ['uid' => $contact['uid']]);
+ if (!DBM::is_result($user)) {
+ QueueModel::removeItem($q_item['id']);
return;
}
- $data = $q_item['content'];
- $public = $q_item['batch'];
- $contact = $c[0];
- $owner = $u[0];
+ $data = $q_item['content'];
+ $public = $q_item['batch'];
+ $owner = $user;
$deliver_status = 0;
switch ($contact['network']) {
case NETWORK_DFRN:
- logger('queue: dfrndelivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>');
+ 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']);
- Cache::set($cachekey_deadguy.$contact['notify'], true, CACHE_QUARTER_HOUR);
+ QueueModel::updateTime($q_item['id']);
+ Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
} else {
- remove_queue_item($q_item['id']);
+ QueueModel::removeItem($q_item['id']);
}
break;
case NETWORK_OSTATUS:
if ($contact['notify']) {
- logger('queue: slapdelivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>');
- $deliver_status = slapper($owner, $contact['notify'], $data);
+ logger('queue: slapdelivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
+ $deliver_status = Salmon::slapper($owner, $contact['notify'], $data);
if ($deliver_status == (-1)) {
- update_queue_time($q_item['id']);
- Cache::set($cachekey_deadguy.$contact['notify'], true, CACHE_QUARTER_HOUR);
+ QueueModel::updateTime($q_item['id']);
+ Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
} else {
- remove_queue_item($q_item['id']);
+ QueueModel::removeItem($q_item['id']);
}
}
break;
case NETWORK_DIASPORA:
if ($contact['notify']) {
- logger('queue: diaspora_delivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>');
- $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, 'Queue:' . $q_item['id'], true);
if ($deliver_status == (-1)) {
- update_queue_time($q_item['id']);
- Cache::set($cachekey_deadguy.$contact['notify'], true, CACHE_QUARTER_HOUR);
+ QueueModel::updateTime($q_item['id']);
+ Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR);
} else {
- remove_queue_item($q_item['id']);
+ QueueModel::removeItem($q_item['id']);
}
}
break;
default:
- $params = array('owner' => $owner, 'contact' => $contact, 'queue' => $q_item, 'result' => false);
- call_hooks('queue_deliver', $a, $params);
+ $params = ['owner' => $owner, 'contact' => $contact, 'queue' => $q_item, 'result' => false];
+ Addon::callHooks('queue_deliver', $params);
if ($params['result']) {
- remove_queue_item($q_item['id']);
+ QueueModel::removeItem($q_item['id']);
} else {
- update_queue_time($q_item['id']);
+ QueueModel::updateTime($q_item['id']);
}
break;
}
- logger('Deliver status '.(int)$deliver_status.' for item '.$q_item['id'].' to '.$contact['name'].' <'.$contact['url'].'>');
+ logger('Deliver status ' . (int) $deliver_status . ' for item ' . $q_item['id'] . ' to ' . $contact['name'] . ' <' . $contact['url'] . '>');
return;
}