Make sure that we only quit when we are sure we can

[friendica.git] / include / queue.php

diff --git a/include/queue.php b/include/queue.php
index 1cc2ee095bb49ae5aea516e8f9be6d34eaba87c3..bcd32985db890d2ea1d36f3e495e2a9278f66ea5 100644 (file)
--- a/include/queue.php
+++ b/include/queue.php
@@ -1,4 +1,7 @@
 <?php
+
+use \Friendica\Core\Config;
+
 require_once("boot.php");
 require_once('include/queue_fn.php');
 require_once('include/dfrn.php');
@@ -23,8 +26,7 @@ function queue_run(&$argv, &$argc){
        require_once('include/bbcode.php');
        require_once('include/socgraph.php');
 
-       load_config('config');
-       load_config('system');
+       Config::load();
 
        // Don't check this stuff if the function is called by the poller
        if (App::callstack() != "poller_run")
@@ -58,20 +60,21 @@ function queue_run(&$argv, &$argc){
                        $interval = false;
 
                $r = q("select * from deliverq where 1");
-               if($r) {
-                       foreach($r as $rr) {
+               if ($r) {
+                       foreach ($r as $rr) {
                                logger('queue: deliverq');
                                proc_run(PRIORITY_HIGH,'include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']);
-                               if($interval)
-                               @time_sleep_until(microtime(true) + (float) $interval);
+                               if($interval) {
+                                       time_sleep_until(microtime(true) + (float) $interval);
+                               }
                        }
                }
 
                $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($r) {
-                       foreach($r as $rr) {
+               if ($r) {
+                       foreach ($r as $rr) {
                                logger('Removing expired queue item for ' . $rr['name'] . ', uid=' . $rr['uid']);
                                logger('Expired queue data :' . $rr['content'], LOGGER_DATA);
                        }
@@ -195,7 +198,7 @@ function queue_run(&$argv, &$argc){
                        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);
 
                                        if($deliver_status == (-1)) {
                                                update_queue_time($q_item['id']);