Reschedule killed processes at the beginning of the queue.

[friendica.git] / include / queue.php

diff --git a/include/queue.php b/include/queue.php
index 1222199c70960c03f00abf8f3bdfde1d0bf83dcd..9779a0733d3f65bcb5916fe37beefccacaf86f6d 100644 (file)
--- a/include/queue.php
+++ b/include/queue.php
@@ -29,7 +29,7 @@ function queue_run(&$argv, &$argc){
 
        // Don't check this stuff if the function is called by the poller
        if (App::callstack() != "poller_run")
-               if (App::is_already_running('include/queue.php', 'queue', 540))
+               if (App::is_already_running('queue', 'include/queue.php', 540))
                        return;
 
        $a->set_baseurl(get_config('system','url'));
@@ -48,7 +48,7 @@ function queue_run(&$argv, &$argc){
        logger('queue: start');
 
        // Handling the pubsubhubbub requests
-       proc_run('php','include/pubsubpublish.php');
+       proc_run(PRIORITY_HIGH,'include/pubsubpublish.php');
 
        $interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
 
@@ -60,7 +60,7 @@ function queue_run(&$argv, &$argc){
        if($r) {
                foreach($r as $rr) {
                        logger('queue: deliverq');
-                       proc_run('php','include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']);
+                       proc_run(PRIORITY_HIGH,'include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']);
                        if($interval)
                                @time_sleep_until(microtime(true) + (float) $interval);
                }
@@ -193,7 +193,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']);