keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't add already queued items from Diaspora to the queue again

Browse source
This commit is contained in:
Michael 2018-02-08 11:26:24 +00:00
parent af55cd57f3
commit 0093f863fd
7 changed files with 19 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -39,7 +39,7 @@ define('FRIENDICA_PLATFORM', 'Friendica');
define('FRIENDICA_CODENAME', 'Asparagus');
define('FRIENDICA_VERSION', '3.6-dev');
define('DFRN_PROTOCOL_VERSION', '2.23');
define('DB_UPDATE_VERSION', 1249);
define('DB_UPDATE_VERSION', 1250);
define('NEW_UPDATE_ROUTINE_VERSION', 1170);
/**

3
database.sql
View file

@ -1,6 +1,6 @@
-- ------------------------------------------
-- Friendica 3.6-dev (Asparagus)
-- DB_UPDATE_VERSION 1248
-- DB_UPDATE_VERSION 1250
-- ------------------------------------------
@ -855,6 +855,7 @@ CREATE TABLE IF NOT EXISTS `queue` (
`id` int NOT NULL auto_increment COMMENT '',
`cid` int NOT NULL DEFAULT 0 COMMENT '',
`network` varchar(32) NOT NULL DEFAULT '' COMMENT '',
`guid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
`last` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
`content` mediumtext COMMENT '',

1
src/Database/DBStructure.php
View file

@ -1551,6 +1551,7 @@ class DBStructure
"id" => ["type" => "int", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
"cid" => ["type" => "int", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => ""],
"network" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => ""],
"guid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
"created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
"last" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
"content" => ["type" => "mediumtext", "comment" => ""],

8
src/Model/Queue.php
View file

@ -66,7 +66,7 @@ class Queue
* @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');
@ -86,10 +86,10 @@ class Queue
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;
}
}
@ -97,10 +97,12 @@ class Queue
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);
}
}

26
src/Protocol/Diaspora.php
View file

@ -3181,7 +3181,7 @@ class Diaspora
*
* @return int Result of the transmission
*/
public static function transmit($owner, $contact, $envelope, $public_batch, $queue_run = false, $guid = "")
public static function transmit($owner, $contact, $envelope, $public_batch, $queue_run = false, $guid = "", $no_queue = false)
{
$a = get_app();
@ -3224,24 +3224,14 @@ class Diaspora
logger("transmit: ".$logid."-".$guid." returns: ".$return_code);
if (!$return_code || (($return_code == 503) && (stristr($a->get_curl_headers(), "retry-after")))) {
logger("queue message");
$r = q(
"SELECT `id` FROM `queue` WHERE `cid` = %d AND `network` = '%s' AND `content` = '%s' AND `batch` = %d LIMIT 1",
intval($contact["id"]),
dbesc(NETWORK_DIASPORA),
dbesc($envelope),
intval($public_batch)
);
if ($r) {
logger("add_to_queue ignored - identical item already in queue");
} else {
if (!$no_queue) {
logger("queue message");
// queue message for redelivery
Queue::add($contact["id"], NETWORK_DIASPORA, $envelope, $public_batch);
// The message could not be delivered. We mark the contact as "dead"
Contact::markForArchival($contact);
Queue::add($contact["id"], NETWORK_DIASPORA, $envelope, $public_batch, $guid);
}
// The message could not be delivered. We mark the contact as "dead"
Contact::markForArchival($contact);
} elseif (($return_code >= 200) && ($return_code <= 299)) {
// We successfully delivered a message, the contact is alive
Contact::unmarkForArchival($contact);
@ -3294,7 +3284,7 @@ class Diaspora
$envelope = self::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch);
if ($spool) {
Queue::add($contact['id'], NETWORK_DIASPORA, $envelope, $public_batch);
Queue::add($contact['id'], NETWORK_DIASPORA, $envelope, $public_batch, $guid);
return true;
} else {
$return_code = self::transmit($owner, $contact, $envelope, $public_batch, false, $guid);

2
src/Worker/Delivery.php
View file

@ -322,7 +322,7 @@ class Delivery {
if ($deliver_status < 0) {
logger('notifier: delivery failed: queuing message');
Queue::add($contact['id'], NETWORK_DFRN, $atom);
Queue::add($contact['id'], NETWORK_DFRN, $atom, false, $target_item['guid']);
// The message could not be delivered. We mark the contact as "dead"
Contact::markForArchival($contact);

2
src/Worker/Queue.php
View file

@ -145,7 +145,7 @@ class Queue
case NETWORK_DIASPORA:
if ($contact['notify']) {
logger('queue: diaspora_delivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
$deliver_status = Diaspora::transmit($owner, $contact, $data, $public, true);
$deliver_status = Diaspora::transmit($owner, $contact, $data, $public, true, 'Queue:' . $q_item['id'], true);
if ($deliver_status == (-1)) {
QueueModel::updateTime($q_item['id']);