Skip to content

[FrameworkBundle] Removed RejectRedeliveredMessageMiddleware to avoid message to be lost if it cannot be processed by both handler and failed transport #40249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: 7.4
Choose a base branch
from
+78 −6
Open

[FrameworkBundle] Removed RejectRedeliveredMessageMiddleware to avoid message to be lost if it cannot be processed by both handler and failed transport #40249

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
354ba2a
Removed `RejectRedeliveredMessageMiddleware` to avoid message to be l…
theravel Feb 18, 2021
787973c
Revert "Removed `RejectRedeliveredMessageMiddleware` to avoid message…
theravel Feb 24, 2021
50b5183
Use RejectRedeliveredMessageMiddleware only in case failed transport …
theravel Feb 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Removed RejectRedeliveredMessageMiddleware to avoid message to be l… 
…ost if it cannot be processed by both handler and failed transport
  • Loading branch information
@theravel
theravel committed Feb 18, 2021
commit 354ba2afc400ec2dfb8d81a4b24e2eaccc652b95
1 change: 0 additions & 1 deletion src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1803,7 +1803,6 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
$defaultMiddleware = [
'before' => [
['id' => 'add_bus_name_stamp_middleware'],
['id' => 'reject_redelivered_message_middleware'],
['id' => 'dispatch_after_current_bus'],
['id' => 'failed_message_processing_middleware'],
],
Expand Down
3 changes: 0 additions & 3 deletions src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
use Symfony\Component\Messenger\Middleware\DispatchAfterCurrentBusMiddleware;
use Symfony\Component\Messenger\Middleware\FailedMessageProcessingMiddleware;
use Symfony\Component\Messenger\Middleware\HandleMessageMiddleware;
use Symfony\Component\Messenger\Middleware\RejectRedeliveredMessageMiddleware;
use Symfony\Component\Messenger\Middleware\RouterContextMiddleware;
use Symfony\Component\Messenger\Middleware\SendMessageMiddleware;
use Symfony\Component\Messenger\Middleware\TraceableMiddleware;
Expand Down Expand Up @@ -91,8 +90,6 @@
service('validator'),
])

->set('messenger.middleware.reject_redelivered_message_middleware', RejectRedeliveredMessageMiddleware::class)

->set('messenger.middleware.failed_message_processing_middleware', FailedMessageProcessingMiddleware::class)

->set('messenger.middleware.traceable', TraceableMiddleware::class)
Expand Down
6 changes: 2 additions & 4 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ public function testNullSessionHandler()

$expected = ['session', 'initialized_session', 'logger', 'session_collector'];
$this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));
$this->assertSame(false, $container->getDefinition('session.storage.factory.native')->getArgument(3));
$this->assertFalse($container->getDefinition('session.storage.factory.native')->getArgument(3));
}

/**
Expand All @@ -597,7 +597,7 @@ public function testNullSessionHandlerLegacy()

$expected = ['session', 'initialized_session', 'logger', 'session_collector'];
$this->assertEquals($expected, array_keys($container->getDefinition('session_listener')->getArgument(0)->getValues()));
$this->assertSame(false, $container->getDefinition('session.storage.factory.native')->getArgument(3));
$this->assertFalse($container->getDefinition('session.storage.factory.native')->getArgument(3));
}

public function testRequest()
Expand Down Expand Up @@ -801,7 +801,6 @@ public function testMessengerWithMultipleBuses()
$this->assertSame([], $container->getDefinition('messenger.bus.commands')->getArgument(0));
$this->assertEquals([
['id' => 'add_bus_name_stamp_middleware', 'arguments' => ['messenger.bus.commands']],
['id' => 'reject_redelivered_message_middleware'],
['id' => 'dispatch_after_current_bus'],
['id' => 'failed_message_processing_middleware'],
['id' => 'send_message'],
Expand All @@ -811,7 +810,6 @@ public function testMessengerWithMultipleBuses()
$this->assertSame([], $container->getDefinition('messenger.bus.events')->getArgument(0));
$this->assertEquals([
['id' => 'add_bus_name_stamp_middleware', 'arguments' => ['messenger.bus.events']],
['id' => 'reject_redelivered_message_middleware'],
['id' => 'dispatch_after_current_bus'],
['id' => 'failed_message_processing_middleware'],
['id' => 'with_factory', 'arguments' => ['foo', true, ['bar' => 'baz']]],
Expand Down
19 changes: 0 additions & 19 deletions src/Symfony/Component/Messenger/Exception/RejectRedeliveredMessageException.php
View file
Open in desktop

This file was deleted.

50 changes: 0 additions & 50 deletions src/Symfony/Component/Messenger/Middleware/RejectRedeliveredMessageMiddleware.php
View file
Open in desktop

This file was deleted.

13 changes: 1 addition & 12 deletions src/Symfony/Component/Messenger/Worker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
use Symfony\Component\Messenger\Event\WorkerStartedEvent;
use Symfony\Component\Messenger\Event\WorkerStoppedEvent;
use Symfony\Component\Messenger\Exception\HandlerFailedException;
use Symfony\Component\Messenger\Exception\RejectRedeliveredMessageException;
use Symfony\Component\Messenger\Exception\RuntimeException;
use Symfony\Component\Messenger\Stamp\ConsumedByWorkerStamp;
use Symfony\Component\Messenger\Stamp\ReceivedStamp;
Expand Down Expand Up @@ -130,24 +129,14 @@ private function handleMessage(Envelope $envelope, ReceiverInterface $receiver,
try {
$envelope = $this->bus->dispatch($envelope->with(new ReceivedStamp($transportName), new ConsumedByWorkerStamp()));
} catch (\Throwable $throwable) {
$rejectFirst = $throwable instanceof RejectRedeliveredMessageException;
if ($rejectFirst) {
// redelivered messages are rejected first so that continuous failures in an event listener or while
// publishing for retry does not cause infinite redelivery loops
$receiver->reject($envelope);
}

if ($throwable instanceof HandlerFailedException) {
$envelope = $throwable->getEnvelope();
}

$failedEvent = new WorkerMessageFailedEvent($envelope, $transportName, $throwable);
$this->dispatchEvent($failedEvent);
$envelope = $failedEvent->getEnvelope();

if (!$rejectFirst) {
$receiver->reject($envelope);
}
$receiver->reject($envelope);

return;
}
Expand Down