Skip to content

[Messenger] multiple failure transports support #34979

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

Closed
wants to merge 15 commits into from
Closed

[Messenger] multiple failure transports support #34979

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9bf20ba
[Messenger] Multiple failure transports support
monteiro Dec 14, 2019
b859172
improved solution using one argument with 2 types in listener
monteiro Sep 19, 2020
3650bb1
fix
monteiro Sep 19, 2020
87b31d3
fix
monteiro Sep 19, 2020
0cd81d0
cs fix
monteiro Sep 19, 2020
129480b
add another service locator for the listener
monteiro Sep 20, 2020
1298546
cs fix
monteiro Sep 20, 2020
0ec420b
cs fix
monteiro Sep 20, 2020
7b4481a
fix
monteiro Sep 20, 2020
5b662b5
fix retry command
monteiro Sep 20, 2020
3e0aeae
fix
monteiro Sep 20, 2020
5b3eb0d
fix SendFailedMessageToFailureTransportListenerTest
monteiro Oct 1, 2020
27eb470
remove failureTransports last argument of FailedMessagesRetryCommand
monteiro Oct 1, 2020
077060a
php cs fix
monteiro Oct 1, 2020
353fc62
wip
monteiro Oct 3, 2020
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
Prev Previous commit
Next Next commit
php cs fix
  • Loading branch information
@monteiro
monteiro committed Oct 1, 2020
commit 077060a0136e5e91be628f8ccbca8e7cf81de41f
3 changes: 1 addition & 2 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 @@ -171,9 +171,8 @@

->set('messenger.failure.send_failed_message_to_failure_transport_listener', SendFailedMessageToFailureTransportListener::class)
->args([
abstract_arg('global failure transport'),
abstract_arg('failure transports'),
service('logger')->ignoreOnInvalid(),
abstract_arg('failure transports by transport name locator'),
])
->tag('kernel.event_subscriber')
->tag('monolog.logger', ['channel' => 'messenger'])
Expand Down
1 change: 0 additions & 1 deletion src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
use Symfony\Component\Console\Output\ConsoleOutputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
use Symfony\Component\DependencyInjection\ServiceLocator;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\Messenger\Event\WorkerMessageReceivedEvent;
use Symfony\Component\Messenger\EventListener\StopWorkerOnMessageLimitListener;
Expand Down
6 changes: 3 additions & 3 deletions ...Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ class SendFailedMessageToFailureTransportListener implements EventSubscriberInte
*/
private $failureSenders;
private $logger;

public function __construct($failureSenders, LoggerInterface $logger = null)
{
if (!$failureSenders instanceof ServiceLocator) {
trigger_deprecation('symfony/messenger', '5.2', 'Passing failureSenders should now pass a ServiceLocator with all the failure transports', __METHOD__);
}

$this->failureSenders = $failureSenders;
$this->logger = $logger;
}
Expand Down Expand Up @@ -101,7 +101,7 @@ private function getFailureSender(string $receiverName): SenderInterface
if ($this->failureSenders instanceof SenderInterface) {
return $this->failureSenders;
}

return $this->failureSenders->get($receiverName);
}

Expand Down
7 changes: 4 additions & 3 deletions ...mponent/Messenger/Tests/EventListener/SendFailedMessageToFailureTransportListenerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,9 @@ public function testItSendsToTheFailureTransport()

$listener->onMessageFailed($event);
}

public function testItSendsToTheFailureTransportWithMultipleFailedTransports() {

public function testItSendsToTheFailureTransportWithMultipleFailedTransports()
{
$sender = $this->createMock(SenderInterface::class);
$sender->expects($this->once())->method('send')->with($this->callback(function ($envelope) {
/* @var Envelope $envelope */
Expand All @@ -86,7 +87,7 @@ public function testItSendsToTheFailureTransportWithMultipleFailedTransports() {

$serviceLocator = $this->createMock(ServiceLocator::class);
$serviceLocator->method('get')->with('my_receiver')->willReturn($sender);

$listener = new SendFailedMessageToFailureTransportListener($serviceLocator);

$exception = new \Exception('no!');
Expand Down