nsq/nsq-bundle
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use native requeue mechanism instead of symfony/messenger resends

Browse Source
This commit is contained in:
Konstantin Grachev
2021-06-09 15:44:40 +03:00
parent 5eea27cb17
commit 70c466740e
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Messenger/NsqReceiver.php
View File

@ -11,6 +11,7 @@ use Nsq\Message;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\Envelope;
use Symfony\Component\Messenger\Exception\MessageDecodingFailedException; use Symfony\Component\Messenger\Exception\MessageDecodingFailedException;
use Symfony\Component\Messenger\Stamp\RedeliveryStamp;
use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp; use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface; use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface;
use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface; use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
@ -76,6 +77,7 @@ final class NsqReceiver implements ReceiverInterface
$envelope->with( $envelope->with(
new NsqReceivedStamp($message), new NsqReceivedStamp($message),
new TransportMessageIdStamp($message->id), new TransportMessageIdStamp($message->id),
new RedeliveryStamp($message->attempts - 1),
), ),
]; ];
} }
@ -97,6 +99,10 @@ final class NsqReceiver implements ReceiverInterface
{ {
$message = NsqReceivedStamp::getMessageFromEnvelope($envelope); $message = NsqReceivedStamp::getMessageFromEnvelope($envelope);
if ($message->isProcessed()) {
return;
}
wait($message->finish()); wait($message->finish());
} }

22
src/Messenger/NsqSender.php
View File

@ -35,14 +35,26 @@ final class NsqSender implements SenderInterface
{ {
$producer = $this->getProducer(); $producer = $this->getProducer();
$encodedMessage = $this->serializer->encode($envelope->withoutAll(NsqReceivedStamp::class));
$encodedMessage = json_encode($encodedMessage, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE);
/** @var DelayStamp|null $delayStamp */ /** @var DelayStamp|null $delayStamp */
$delayStamp = $envelope->last(DelayStamp::class); $delayStamp = $envelope->last(DelayStamp::class);
$delay = null !== $delayStamp ? $delayStamp->getDelay() : null; $delay = null !== $delayStamp ? $delayStamp->getDelay() : 0;
$promise = $producer->publish($this->topic, $encodedMessage, $delay); $promise = null;
if (null !== $envelope->last(NsqReceivedStamp::class)) {
$message = NsqReceivedStamp::getMessageFromEnvelope($envelope);
if (!$message->isProcessed()) {
$promise = $message->requeue($delay);
}
}
if (null === $promise) {
$encodedMessage = $this->serializer->encode($envelope->withoutAll(NsqReceivedStamp::class));
$encodedMessage = json_encode($encodedMessage, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE);
$promise = $producer->publish($this->topic, $encodedMessage, $delay);
}
wait($promise); wait($promise);