Degrade priority step by step

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
index d7e8a9ccec5a6760cf380de608ad0d8929f39c15..81f55f710190e3fc9a8499e374ccf81900d942b2 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -55,19 +55,6 @@ function notifier_run(&$argv, &$argc){
                return;
        }
 
-       // Inherit the priority
-       $queue = dba::select('workerqueue', array('priority', 'created'), array('pid' => getmypid()), array('limit' => 1));
-       if (dbm::is_result($queue)) {
-               $priority = (int)$queue['priority'];
-               $process_created = $queue['created'];
-               logger('inherited priority: '.$priority);
-       } else {
-               // Normally this shouldn't happen.
-               $priority = PRIORITY_HIGH;
-               $process_created = datetime_convert();
-               logger('no inherited priority! Something is wrong.');
-       }
-
        logger('notifier: invoked: ' . print_r($argv,true), LOGGER_DEBUG);
 
        $cmd = $argv[1];
@@ -361,7 +348,7 @@ function notifier_run(&$argv, &$argc){
                        // a delivery fork. private groups (forum_mode == 2) do not uplink
 
                        if ((intval($parent['forum_mode']) == 1) && (! $top_level) && ($cmd !== 'uplink')) {
-                               proc_run($priority, 'include/notifier.php', 'uplink', $item_id);
+                               proc_run($a->queue['priority'], 'include/notifier.php', 'uplink', $item_id);
                        }
 
                        $conversants = array();
@@ -500,8 +487,8 @@ function notifier_run(&$argv, &$argc){
                        }
                        logger("Deliver ".$target_item["guid"]." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG);
 
-                       proc_run(array('priority' => $priority, 'created' => $process_created, 'dont_fork' => true),
-                                       'include/delivery.php', $cmd, $item_id, $contact['id']);
+                       proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
+                                       'include/delivery.php', $cmd, $item_id, (int)$contact['id']);
                }
        }
 
@@ -532,8 +519,8 @@ function notifier_run(&$argv, &$argc){
                        }
 
                        $r1 = q("SELECT `batch`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`name`) AS `name`, ANY_VALUE(`network`) AS `network`
-                               FROM `contact` WHERE `network` = '%s'
-                               AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch` ORDER BY rand()",
+                               FROM `contact` WHERE `network` = '%s' AND `batch` != ''
+                               AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch`",
                                dbesc(NETWORK_DIASPORA),
                                intval($owner['uid']),
                                intval(CONTACT_IS_SHARING)
@@ -541,8 +528,7 @@ function notifier_run(&$argv, &$argc){
                }
 
                $r2 = q("SELECT `id`, `name`,`network` FROM `contact`
-                       WHERE `network` in ( '%s', '%s')  AND `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `archive`
-                       AND `rel` != %d order by rand() ",
+                       WHERE `network` in ('%s', '%s') AND `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `rel` != %d",
                        dbesc(NETWORK_DFRN),
                        dbesc(NETWORK_MAIL2),
                        intval($owner['uid']),
@@ -566,8 +552,8 @@ function notifier_run(&$argv, &$argc){
 
                                if ((! $mail) && (! $fsuggest) && (! $followup)) {
                                        logger('notifier: delivery agent: '.$rr['name'].' '.$rr['id'].' '.$rr['network'].' '.$target_item["guid"]);
-                                       proc_run(array('priority' => $priority, 'created' => $process_created, 'dont_fork' => true),
-                                                       'include/delivery.php', $cmd, $item_id, $rr['id']);
+                                       proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
+                                                       'include/delivery.php', $cmd, $item_id, (int)$rr['id']);
                                }
                        }
                }
@@ -607,7 +593,7 @@ function notifier_run(&$argv, &$argc){
                }
 
                // Handling the pubsubhubbub requests
-               proc_run(array('priority' => PRIORITY_HIGH, 'created' => $process_created, 'dont_fork' => true),
+               proc_run(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true),
                                'include/pubsubpublish.php');
        }