Restore previous permission comment in Widget\CalendarExport

[friendica.git] / src / Worker / Queue.php

diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php
index d92be19fe3bf8ffac5c7b9db01bc9f17cf4bef74..3f4a764cee244f14f4aa927b7d4cd5cbfef68acf 100644 (file)
--- a/src/Worker/Queue.php
+++ b/src/Worker/Queue.php
@@ -18,7 +18,6 @@ use dba;
 
 require_once 'include/dba.php';
 require_once 'include/items.php';
-require_once 'include/bbcode.php';
 
 class Queue
 {
@@ -32,30 +31,12 @@ class Queue
                $no_dead_check = Config::get('system', 'queue_no_dead_check', false);
 
                if (!$queue_id) {
-                       logger('queue: start');
+                       logger('filling queue jobs - start');
 
                        // Handling the pubsubhubbub requests
                        Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], 'PubSubPublish');
 
-                       $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 (DBM::is_result($r)) {
-                               foreach ($r as $rr) {
-                                       logger('Removing expired queue item for ' . $rr['name'] . ', uid=' . $rr['uid']);
-                                       logger('Expired queue data: ' . $rr['content'], LOGGER_DATA);
-                               }
-                               q("DELETE FROM `queue` WHERE `created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
-                       }
-
-                       /*
-                        * For the first 12 hours we'll try to deliver every 15 minutes
-                        * After that, we'll only attempt delivery once per hour.
-                        */
-                       $r = q("SELECT `id` FROM `queue` WHERE ((`created` > UTC_TIMESTAMP() - INTERVAL 12 HOUR AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE) OR (`last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR)) ORDER BY `cid`, `created`");
+                       $r = dba::inArray(dba::p("SELECT `id` FROM `queue` WHERE `next` < UTC_TIMESTAMP()"));
 
                        Addon::callHooks('queue_predeliver', $r);
 
@@ -65,6 +46,7 @@ class Queue
                                        Worker::add(['priority' => PRIORITY_LOW, 'dont_fork' => true], "Queue", (int) $q_item['id']);
                                }
                        }
+                       logger('filling queue jobs - end');
                        return;
                }