starting the big delivery shakeup

[friendica.git] / include / queue.php

diff --git a/include/queue.php b/include/queue.php
index 1ac1e7d48c6db3f000847977b6c69f1ef081bc20..d312b50f5a99fe778feee4563f4252098ca813cc 100644 (file)
--- a/include/queue.php
+++ b/include/queue.php
@@ -38,16 +38,15 @@ function queue_run($argv, $argc){
 
        logger('queue: start');
 
-       $interval = intval(get_config('system','delivery_interval'));
-       if(! $interval)
-               $interval = 2;
+       $interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
 
        $r = q("select * from deliverq where 1");
        if(count($r)) {
                foreach($r as $rr) {
                        logger('queue: deliverq');
                        proc_run('php','include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']);
-                       @time_sleep_until(microtime(true) + (float) $interval);
+                       if($interval)
+                               @time_sleep_until(microtime(true) + (float) $interval);
                }
        }
 
@@ -124,6 +123,7 @@ function queue_run($argv, $argc){
                }
 
                $data      = $qi[0]['content'];
+               $public    = $qi[0]['batch'];
                $contact   = $c[0];
                $owner     = $u[0];
 
@@ -156,7 +156,7 @@ function queue_run($argv, $argc){
                        case NETWORK_DIASPORA:
                                if($contact['notify']) {
                                        logger('queue: diaspora_delivery: item ' . $q_item['id'] . ' for ' . $contact['name']);
-                                       $deliver_status = diaspora_transmit($owner,$contact,$data);
+                                       $deliver_status = diaspora_transmit($owner,$contact,$data,$public);
 
                                        if($deliver_status == (-1))
                                                update_queue_time($q_item['id']);