Use native requeue mechanism instead of symfony/messenger resends
This commit is contained in:
@ -11,6 +11,7 @@ use Nsq\Message;
|
||||
use Psr\Log\LoggerInterface;
|
||||
use Symfony\Component\Messenger\Envelope;
|
||||
use Symfony\Component\Messenger\Exception\MessageDecodingFailedException;
|
||||
use Symfony\Component\Messenger\Stamp\RedeliveryStamp;
|
||||
use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
|
||||
use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface;
|
||||
use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
|
||||
@ -76,6 +77,7 @@ final class NsqReceiver implements ReceiverInterface
|
||||
$envelope->with(
|
||||
new NsqReceivedStamp($message),
|
||||
new TransportMessageIdStamp($message->id),
|
||||
new RedeliveryStamp($message->attempts - 1),
|
||||
),
|
||||
];
|
||||
}
|
||||
@ -97,6 +99,10 @@ final class NsqReceiver implements ReceiverInterface
|
||||
{
|
||||
$message = NsqReceivedStamp::getMessageFromEnvelope($envelope);
|
||||
|
||||
if ($message->isProcessed()) {
|
||||
return;
|
||||
}
|
||||
|
||||
wait($message->finish());
|
||||
}
|
||||
|
||||
|
@ -35,14 +35,26 @@ final class NsqSender implements SenderInterface
|
||||
{
|
||||
$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 */
|
||||
$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);
|
||||
|
||||
|
Reference in New Issue
Block a user