Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention-split...

[friendica.git] / include / queue.php

diff --git a/include/queue.php b/include/queue.php
index dbed4604735e7eaedf0b672f665c4e7d6ac8be4b..f721326f06e4049bf97de210377168e7183c4402 100644 (file)
--- a/include/queue.php
+++ b/include/queue.php
@@ -2,15 +2,15 @@
 
 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){
+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) {
        global $a;
 
        if ($argc > 1) {
@@ -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`
@@ -41,17 +41,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)) {
                        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;
@@ -60,8 +61,8 @@ function queue_run(&$argv, &$argc){
 
        // delivering
 
-       require_once('include/salmon.php');
-       require_once('include/diaspora.php');
+       require_once 'include/salmon.php';
+       require_once 'include/diaspora.php';
 
        $r = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
                intval($queue_id));
@@ -83,7 +84,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 +102,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;