use Friendica\Core\Worker;
use Friendica\Database\DBM;
use Friendica\Model\Queue as QueueModel;
-use Friendica\Protocol\Diaspora;
use Friendica\Protocol\DFRN;
+use Friendica\Protocol\Diaspora;
use Friendica\Protocol\PortableContact;
use Friendica\Protocol\Salmon;
use dba;
require_once 'include/dba.php';
-require_once 'include/datetime.php';
require_once 'include/items.php';
-require_once 'include/bbcode.php';
class Queue
{
$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(['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");
- }
-
- /*
- * 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()"));
Addon::callHooks('queue_predeliver', $r);
Worker::add(['priority' => PRIORITY_LOW, 'dont_fork' => true], "Queue", (int) $q_item['id']);
}
}
+ logger('filling queue jobs - end');
return;
}
$dead = Cache::get($cachekey_deadguy . $contact['notify']);
- if (!is_null($dead) && $dead) {
+ 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($contact['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 . " (" . $contact["network"] . ")");
+ if (is_null($vital)) {
+ logger("Check server " . $server . " (" . $contact["network"] . ")");
- $vital = PortableContact::checkServer($server, $contact["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);
- QueueModel::updateTime($q_item['id']);
- return;
+ if (!is_null($vital) && !$vital) {
+ logger('queue: skipping dead server: ' . $server);
+ QueueModel::updateTime($q_item['id']);
+ return;
+ }
}
}
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);
+ $deliver_status = Diaspora::transmit($owner, $contact, $data, $public, true, 'Queue:' . $q_item['id'], true);
if ($deliver_status == (-1)) {
QueueModel::updateTime($q_item['id']);