Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba

[friendica.git] / include / queue_fn.php

diff --git a/include/queue_fn.php b/include/queue_fn.php
index 5214131b2bf0ed1e119b98379857838d6cf8ea20..9dcefdd244b59288c9177a401735d186480a680b 100644 (file)
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -15,22 +15,34 @@ function remove_queue_item($id) {
        );
 }
 
+/**
+ * @brief Checks if the communication with a given contact had problems recently
+ *
+ * @param int $cid Contact id
+ *
+ * @return bool The communication with this contact has currently problems
+ */
 function was_recently_delayed($cid) {
+       $was_delayed = false;
 
-       $r = q("SELECT `id` FROM `queue` WHERE `cid` = %d 
-               and last > UTC_TIMESTAMP() - interval 15 minute limit 1",
+       // Are there queue entries that were recently added?
+       $r = q("SELECT `id` FROM `queue` WHERE `cid` = %d
+               AND `last` > UTC_TIMESTAMP() - INTERVAL 15 MINUTE LIMIT 1",
                intval($cid)
        );
-       if(count($r))
-               return true;
 
-       $r = q("select `term-date` from contact where id = %d and `term-date` != '' and `term-date` != '0000-00-00 00:00:00' limit 1",
-               intval($cid)
-       );
-       if(count($r))
-               return true;
+       $was_delayed = dbm::is_result($r);
+
+       // We set "term-date" to a current date if the communication has problems.
+       // If the communication works again we reset this value.
+       if ($was_delayed) {
+               $r = q("SELECT `term-date` FROM `contact` WHERE `id` = %d AND `term-date` <= '1000-01-01' LIMIT 1",
+                       intval($cid)
+               );
+               $was_delayed = !dbm::is_result($r);
+       }
 
-       return false;
+       return $was_delayed;
 }
 
 
@@ -48,7 +60,7 @@ function add_to_queue($cid,$network,$msg,$batch = false) {
                WHERE `queue`.`cid` = %d AND `contact`.`self` = 0 ",
                intval($cid)
        );
-       if($r && count($r)) {
+       if (dbm::is_result($r)) {
                if($batch &&  ($r[0]['total'] > $batch_queue)) {
                        logger('add_to_queue: too many queued items for batch server ' . $cid . ' - discarding message');
                        return;