Degrade priority step by step

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
index dd0a65089a12c61a09b1599b1023c15d66e797fa..81f55f710190e3fc9a8499e374ccf81900d942b2 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -55,17 +55,6 @@ function notifier_run(&$argv, &$argc){
                return;
        }
 
-       // Inherit the priority
-       $queue = dba::select('workerqueue', array('priority'), array('pid' => getmypid()), array('limit' => 1));
-       if (dbm::is_result($queue)) {
-               $priority = $queue['priority'];
-               logger('inherited priority: '.$priority);
-       } else {
-               // Normally this shouldn't happen.
-               $priority = PRIORITY_HIGH;
-               logger('no inherited priority! Something is wrong.');
-       }
-
        logger('notifier: invoked: ' . print_r($argv,true), LOGGER_DEBUG);
 
        $cmd = $argv[1];
@@ -163,7 +152,7 @@ function notifier_run(&$argv, &$argc){
                $recipients_relocate = q("SELECT * FROM contact WHERE uid = %d  AND self = 0 AND network = '%s'" , intval($uid), NETWORK_DFRN);
        } else {
                // find ancestors
-               $r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1",
+               $r = q("SELECT * FROM `item` WHERE `id` = %d AND visible = 1 AND moderated = 0 LIMIT 1",
                        intval($item_id)
                );
 
@@ -177,7 +166,7 @@ function notifier_run(&$argv, &$argc){
                $updated = $r[0]['edited'];
 
                $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
-                       FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d and visible = 1 and moderated = 0 ORDER BY `id` ASC",
+                       FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d AND visible = 1 AND moderated = 0 ORDER BY `id` ASC",
                        intval($parent_id)
                );
 
@@ -306,13 +295,13 @@ function notifier_run(&$argv, &$argc){
                        $recipients = array($parent['contact-id']);
                        $recipients_followup  = array($parent['contact-id']);
 
-                       //if (!$target_item['private'] AND $target_item['wall'] AND
-                       if (!$target_item['private'] AND
+                       //if (!$target_item['private'] && $target_item['wall'] &&
+                       if (!$target_item['private'] &&
                                (strlen($target_item['allow_cid'].$target_item['allow_gid'].
                                        $target_item['deny_cid'].$target_item['deny_gid']) == 0))
                                $push_notify = true;
 
-                       if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) {
+                       if (($thr_parent && ($thr_parent[0]['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) {
 
                                $push_notify = true;
 
@@ -359,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();
@@ -396,7 +385,7 @@ function notifier_run(&$argv, &$argc){
 
                // If the thread parent is OStatus then do some magic to distribute the messages.
                // We have not only to look at the parent, since it could be a Friendica thread.
-               if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) {
+               if (($thr_parent && ($thr_parent[0]['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) {
 
                        $diaspora_delivery = false;
 
@@ -498,7 +487,8 @@ function notifier_run(&$argv, &$argc){
                        }
                        logger("Deliver ".$target_item["guid"]." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG);
 
-                       proc_run($priority, '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']);
                }
        }
 
@@ -529,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)
@@ -538,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']),
@@ -563,7 +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($priority, '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']);
                                }
                        }
                }
@@ -573,7 +563,7 @@ function notifier_run(&$argv, &$argc){
        }
 
        // Notify PuSH subscribers (Used for OStatus distribution of regular posts)
-       if ($push_notify AND strlen($hub)) {
+       if ($push_notify && strlen($hub)) {
                $hubs = explode(',', $hub);
                if (count($hubs)) {
                        foreach ($hubs as $h) {
@@ -603,7 +593,8 @@ function notifier_run(&$argv, &$argc){
                }
 
                // Handling the pubsubhubbub requests
-               proc_run($priority, 'include/pubsubpublish.php');
+               proc_run(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true),
+                               'include/pubsubpublish.php');
        }
 
        logger('notifier: calling hooks', LOGGER_DEBUG);