use Friendica\Core\Config;
use Friendica\Database\DBM;
+use Friendica\Util\DateTimeFormat;
use dba;
require_once 'include/dba.php';
-require_once 'include/datetime.php';
class Queue
{
public static function updateTime($id)
{
logger('queue: requeue item ' . $id);
- dba::update('queue', ['last' => datetime_convert()], ['id' => $id]);
+ $queue = dba::selectFirst('queue', ['retrial'], ['id' => $id]);
+ if (!DBM::is_result($queue)) {
+ return;
+ }
+
+ $retrial = $queue['retrial'];
+
+ if ($retrial > 14) {
+ self::removeItem($id);
+ }
+
+ // Calculate the delay until the next trial
+ $delay = (($retrial + 3) ** 4) + (rand(1, 30) * ($retrial + 1));
+ $next = DateTimeFormat::utc('now + ' . $delay . ' seconds');
+
+ dba::update('queue', ['last' => DateTimeFormat::utcNow(), 'retrial' => $retrial + 1, 'next' => $next], ['id' => $id]);
}
-
+
/**
* @param string $id id
*/
logger('queue: remove queue item ' . $id);
dba::delete('queue', ['id' => $id]);
}
-
+
/**
* @brief Checks if the communication with a given contact had problems recently
*
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) {
);
$was_delayed = !DBM::is_result($r);
}
-
+
return $was_delayed;
}
-
+
/**
* @param string $cid cid
* @param string $network network
* @param string $msg message
* @param boolean $batch batch, default false
*/
- public static function add($cid, $network, $msg, $batch = false)
+ public static function add($cid, $network, $msg, $batch = false, $guid = '')
{
-
+
$max_queue = Config::get('system', 'max_contact_queue');
if ($max_queue < 1) {
$max_queue = 500;
}
-
+
$batch_queue = Config::get('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');
+ logger('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');
+ logger('too many queued items for contact ' . $cid . ' - discarding message');
return;
}
}
-
- dba::insert('queue', ['cid' => $cid, 'network' => $network, 'created' => datetime_convert(), 'last' => datetime_convert(), 'content' => $msg, 'batch' =>($batch) ? 1 : 0]);
+
+ dba::insert('queue', [
+ 'cid' => $cid,
+ 'network' => $network,
+ 'guid' => $guid,
+ 'created' => DateTimeFormat::utcNow(),
+ 'last' => DateTimeFormat::utcNow(),
+ 'content' => $msg,
+ 'batch' =>($batch) ? 1 : 0
+ ]);
+ logger('Added item ' . $guid . ' for ' . $cid);
}
}