X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fqueue_fn.php;h=9dcefdd244b59288c9177a401735d186480a680b;hb=84b733e1bf25bdd1074483f19113add7800a6c38;hp=bc47ceffdbeae859178478c70df9258c55bbf5ba;hpb=ebb8186191d46f6b264d09f886d5574761194685;p=friendica.git diff --git a/include/queue_fn.php b/include/queue_fn.php index bc47ceffdb..9dcefdd244 100644 --- a/include/queue_fn.php +++ b/include/queue_fn.php @@ -2,7 +2,7 @@ function update_queue_time($id) { logger('queue: requeue item ' . $id); - q("UPDATE `queue` SET `last` = '%s' WHERE `id` = %d LIMIT 1", + q("UPDATE `queue` SET `last` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), intval($id) ); @@ -10,7 +10,75 @@ function update_queue_time($id) { function remove_queue_item($id) { logger('queue: remove queue item ' . $id); - q("DELETE FROM `queue` WHERE `id` = %d LIMIT 1", + q("DELETE FROM `queue` WHERE `id` = %d", intval($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; + + // 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) + ); + + $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 $was_delayed; +} + + +function add_to_queue($cid,$network,$msg,$batch = false) { + + $max_queue = get_config('system','max_contact_queue'); + if($max_queue < 1) + $max_queue = 500; + + $batch_queue = get_config('system','max_batch_queue'); + if($batch_queue < 1) + $batch_queue = 1000; + + $r = q("SELECT COUNT(*) AS `total` FROM `queue` INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id` + WHERE `queue`.`cid` = %d AND `contact`.`self` = 0 ", + intval($cid) + ); + 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; + } + elseif((! $batch) && ($r[0]['total'] > $max_queue)) { + logger('add_to_queue: too many queued items for contact ' . $cid . ' - discarding message'); + return; + } + } + + q("INSERT INTO `queue` ( `cid`, `network`, `created`, `last`, `content`, `batch`) + VALUES ( %d, '%s', '%s', '%s', '%s', %d) ", + intval($cid), + dbesc($network), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc($msg), + intval(($batch) ? 1: 0) + ); + +}