clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6972 from annando/queue-to-worker 

Use deferred workers instead of the queue mechanism
This commit is contained in:
Hypolite Petovan 2019-04-04 17:29:16 -04:00 committed by GitHub
parent c439cb656a e3caf0f4f5
commit 26c2290fed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Protocol/Diaspora.php
View File

@ -3223,9 +3223,9 @@ class Diaspora
if (!$return_code || (($return_code == 503) && (stristr($postResult->getHeader(), "retry-after")))) {
if (!$no_queue && !empty($contact['contact-type']) && ($contact['contact-type'] != Contact::TYPE_RELAY)) {
Logger::log("queue message");
// queue message for redelivery
Queue::add($contact["id"], Protocol::DIASPORA, $envelope, $public_batch, $guid);
Logger::info('defer message', ['log' => $logid, 'guid' => $guid, 'destination' => $dest_url]);
// defer message for redelivery
Worker::defer();
}
// The message could not be delivered. We mark the contact as "dead"
@ -3263,13 +3263,12 @@ class Diaspora
* @param array $message The message data
* @param bool $public_batch Is it a public post?
* @param string $guid message guid
* @param bool $spool Should the transmission be spooled or transmitted?
*
* @return int Result of the transmission
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
private static function buildAndTransmit(array $owner, array $contact, $type, $message, $public_batch = false, $guid = "", $spool = false)
private static function buildAndTransmit(array $owner, array $contact, $type, $message, $public_batch = false, $guid = "")
{
$msg = self::buildPostXml($type, $message);
@ -3283,12 +3282,7 @@ class Diaspora
$envelope = self::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch);
if ($spool) {
Queue::add($contact['id'], Protocol::DIASPORA, $envelope, $public_batch, $guid);
return true;
} else {
$return_code = self::transmit($owner, $contact, $envelope, $public_batch, false, $guid);
}
$return_code = self::transmit($owner, $contact, $envelope, $public_batch, false, $guid);
Logger::log("guid: ".$guid." result ".$return_code, Logger::DEBUG);
@ -4284,7 +4278,7 @@ class Diaspora
foreach ($recips as $recip) {
Logger::log("Send updated profile data for user ".$uid." to contact ".$recip["id"], Logger::DEBUG);
self::buildAndTransmit($owner, $recip, "profile", $message, false, "", false);
self::buildAndTransmit($owner, $recip, "profile", $message, false);
}
}

5
src/Worker/Delivery.php
View File

@ -17,6 +17,7 @@ use Friendica\Protocol\Diaspora;
use Friendica\Protocol\Email;
use Friendica\Util\Strings;
use Friendica\Util\Network;
use Friendica\Core\Worker;
class Delivery extends BaseObject
{
@ -321,8 +322,8 @@ class Delivery extends BaseObject
Logger::log('Delivery to ' . $contact['url'] . ' with guid ' . defaults($target_item, 'guid', $target_item['id']) . ' returns ' . $deliver_status);
if ($deliver_status < 0) {
Logger::log('Delivery failed: queuing message ' . defaults($target_item, 'guid', $target_item['id']));
Model\Queue::add($contact['id'], Protocol::DFRN, $atom, false, $target_item['guid']);
Logger::info('Delivery failed: defer message', ['id' => defaults($target_item, 'guid', $target_item['id'])]);
Worker::defer();
}
if (($deliver_status >= 200) && ($deliver_status <= 299)) {