We got rid of two workerqueue queries, yeah!

[friendica.git] / include / queue.php

diff --git a/include/queue.php b/include/queue.php
index dbed4604735e7eaedf0b672f665c4e7d6ac8be4b..5e73922f9a948daf9b939397061e8856a17f7333 100644 (file)
--- a/include/queue.php
+++ b/include/queue.php
@@ -27,7 +27,7 @@ function queue_run(&$argv, &$argc){
                logger('queue: start');
 
                // Handling the pubsubhubbub requests
-               proc_run(PRIORITY_HIGH,'include/pubsubpublish.php');
+               proc_run(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'include/pubsubpublish.php');
 
                $r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`
                        INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
@@ -44,14 +44,14 @@ function queue_run(&$argv, &$argc){
                // 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`");
+               $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)) {
                        foreach ($r as $q_item) {
                                logger('Call queue for id '.$q_item['id']);
-                               proc_run(PRIORITY_LOW, "include/queue.php", $q_item['id']);
+                               proc_run(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "include/queue.php", $q_item['id']);
                        }
                }
                return;
@@ -83,7 +83,7 @@ function queue_run(&$argv, &$argc){
 
        $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,7 +101,7 @@ 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;