Merge pull request #3902 from annando/worker-space

[friendica.git] / include / queue.php

diff --git a/include/queue.php b/include/queue.php
index dbed4604735e7eaedf0b672f665c4e7d6ac8be4b..a56c41d97a9c19ad785a95c70f5a24ffd82c79b2 100644 (file)
--- a/include/queue.php
+++ b/include/queue.php
@@ -1,16 +1,22 @@
 <?php
-
+/**
+ * @file include/queue.php
+ */
+use Friendica\Core\Cache;
 use Friendica\Core\Config;
-
-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){
+use Friendica\Core\Worker;
+use Friendica\Database\DBM;
+use Friendica\Protocol\Diaspora;
+use Friendica\Protocol\DFRN;
+
+require_once 'include/queue_fn.php';
+require_once 'include/datetime.php';
+require_once 'include/items.php';
+require_once 'include/bbcode.php';
+require_once 'include/socgraph.php';
+
+function queue_run(&$argv, &$argc)
+{
        global $a;
 
        if ($argc > 1) {
@@ -23,17 +29,18 @@ function queue_run(&$argv, &$argc){
        $cachekey_server = 'queue_run:server:';
 
        if (!$queue_id) {
-
                logger('queue: start');
 
                // Handling the pubsubhubbub requests
-               proc_run(PRIORITY_HIGH,'include/pubsubpublish.php');
+               Worker::add(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'pubsubpublish');
 
-               $r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`
+               $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");
+                       WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY"
+               );
 
-               if (dbm::is_result($r)) {
+               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);
@@ -41,17 +48,18 @@ function queue_run(&$argv, &$argc){
                        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 && `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE) OR (`last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR)) ORDER BY `cid`, `created`");
+               /*
+                * 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`");
 
                call_hooks('queue_predeliver', $a, $r);
 
-               if (dbm::is_result($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']);
+                               Worker::add(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "queue", (int)$q_item['id']);
                        }
                }
                return;
@@ -60,30 +68,32 @@ function queue_run(&$argv, &$argc){
 
        // delivering
 
-       require_once('include/salmon.php');
-       require_once('include/diaspora.php');
+       require_once 'include/salmon.php';
 
-       $r = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
-               intval($queue_id));
+       $r = q(
+               "SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
+               intval($queue_id)
+       );
 
-       if (!dbm::is_result($r)) {
+       if (!DBM::is_result($r)) {
                return;
        }
 
        $q_item = $r[0];
 
-       $c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
+       $c = q(
+               "SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
                intval($q_item['cid'])
        );
 
-       if (!dbm::is_result($c)) {
+       if (!DBM::is_result($c)) {
                remove_queue_item($q_item['id']);
                return;
        }
 
        $dead = Cache::get($cachekey_deadguy.$c[0]['notify']);
 
-       if (!is_null($dead) AND $dead) {
+       if (!is_null($dead) && $dead) {
                logger('queue: skipping known dead url: '.$c[0]['notify']);
                update_queue_time($q_item['id']);
                return;
@@ -101,18 +111,19 @@ function queue_run(&$argv, &$argc){
                        Cache::set($cachekey_server.$server, $vital, CACHE_QUARTER_HOUR);
                }
 
-               if (!is_null($vital) AND !$vital) {
+               if (!is_null($vital) && !$vital) {
                        logger('queue: skipping dead server: '.$server);
                        update_queue_time($q_item['id']);
                        return;
                }
        }
 
-       $u = q("SELECT `user`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`
+       $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)) {
+       if (!DBM::is_result($u)) {
                remove_queue_item($q_item['id']);
                return;
        }
@@ -127,7 +138,7 @@ function queue_run(&$argv, &$argc){
        switch ($contact['network']) {
                case NETWORK_DFRN:
                        logger('queue: dfrndelivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>');
-                       $deliver_status = dfrn::deliver($owner, $contact, $data);
+                       $deliver_status = DFRN::deliver($owner, $contact, $data);
 
                        if ($deliver_status == (-1)) {
                                update_queue_time($q_item['id']);
@@ -173,7 +184,6 @@ function queue_run(&$argv, &$argc){
                                update_queue_time($q_item['id']);
                        }
                        break;
-
        }
        logger('Deliver status '.(int)$deliver_status.' for item '.$q_item['id'].' to '.$contact['name'].' <'.$contact['url'].'>');