Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit099a646

Browse files
committed
messenger: multiple failed transports support
1 parent9f74fb0 commit099a646

File tree

3 files changed

+35
-7
lines changed

3 files changed

+35
-7
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,6 +1128,10 @@ function ($a) {
11281128
->prototype('variable')
11291129
->end()
11301130
->end()
1131+
->scalarNode('failure_transport')
1132+
->defaultNull()
1133+
->info('Transport name to send failed messages to (after all retries have failed).')
1134+
->end()
11311135
->arrayNode('retry_strategy')
11321136
->addDefaultsIfNotSet()
11331137
->beforeNormalization()

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@
8181
useSymfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkTransportFactory;
8282
useSymfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridTransportFactory;
8383
useSymfony\Component\Mailer\Mailer;
84+
useSymfony\Component\Messenger\Command\FailedMessagesRetryCommand;
85+
useSymfony\Component\Messenger\EventListener\SendFailedMessageToFailureTransportListener;
8486
useSymfony\Component\Messenger\Handler\MessageHandlerInterface;
8587
useSymfony\Component\Messenger\MessageBus;
8688
useSymfony\Component\Messenger\MessageBusInterface;
@@ -1701,25 +1703,46 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
17011703
$container->getDefinition('messenger.retry_strategy_locator')
17021704
->replaceArgument(0,$transportRetryReferences);
17031705

1706+
$failureTransports = [];
17041707
if ($config['failure_transport']) {
17051708
if (!isset($senderReferences[$config['failure_transport']])) {
17061709
thrownewLogicException(sprintf('Invalid Messenger configuration: the failure transport "%s" is not a valid transport or service id.',$config['failure_transport']));
17071710
}
17081711

1712+
$transports =array_keys($config['transports']);
1713+
$numberOfTransports =count($transports);
1714+
$failureTransports =array_combine($transports,array_fill(0,$numberOfTransports,$senderReferences[$config['failure_transport']]));
1715+
17091716
$container->getDefinition('messenger.failure.send_failed_message_to_failure_transport_listener')
1710-
->replaceArgument(0,$senderReferences[$config['failure_transport']]);
1717+
->replaceArgument(0,$failureTransports);
17111718
$container->getDefinition('console.command.messenger_failed_messages_retry')
17121719
->replaceArgument(0,$config['failure_transport']);
17131720
$container->getDefinition('console.command.messenger_failed_messages_show')
17141721
->replaceArgument(0,$config['failure_transport']);
17151722
$container->getDefinition('console.command.messenger_failed_messages_remove')
17161723
->replaceArgument(0,$config['failure_transport']);
17171724
}else {
1718-
$container->removeDefinition('messenger.failure.send_failed_message_to_failure_transport_listener');
17191725
$container->removeDefinition('console.command.messenger_failed_messages_retry');
17201726
$container->removeDefinition('console.command.messenger_failed_messages_show');
17211727
$container->removeDefinition('console.command.messenger_failed_messages_remove');
17221728
}
1729+
1730+
foreach ($config['transports']as$name =>$transport) {
1731+
if ($transport['failure_transport']) {
1732+
if (!isset($config['transports'][$transport['failure_transport']])) {
1733+
thrownewLogicException(sprintf('Invalid Messenger configuration: the failure transport "%s" is not a valid transport or service id.',$transport['failure_transport']));
1734+
}
1735+
1736+
$failureTransports[$name] =$senderReferences[$transport['failure_transport']];
1737+
}
1738+
}
1739+
1740+
if (!empty($failureTransports)) {
1741+
$container->getDefinition('messenger.failure.send_failed_message_to_failure_transport_listener')
1742+
->replaceArgument(0,$failureTransports);
1743+
}else {
1744+
$container->removeDefinition('messenger.failure.send_failed_message_to_failure_transport_listener');
1745+
}
17231746
}
17241747

17251748
privatefunctionregisterCacheConfiguration(array$config,ContainerBuilder$container)

‎src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
*/
2828
class SendFailedMessageToFailureTransportListenerimplements EventSubscriberInterface
2929
{
30-
private$failureSender;
30+
private$failureSenders;
3131
private$logger;
3232

33-
publicfunction__construct(SenderInterface$failureSender,LoggerInterface$logger =null)
33+
publicfunction__construct(array$failureSenders,LoggerInterface$logger =null)
3434
{
35-
$this->failureSender =$failureSender;
35+
$this->failureSenders =$failureSenders;
3636
$this->logger =$logger;
3737
}
3838

@@ -61,14 +61,15 @@ public function onMessageFailed(WorkerMessageFailedEvent $event)
6161
newRedeliveryStamp(0,$throwable->getMessage(),$flattenedException)
6262
);
6363

64+
$failureSender =$this->failureSenders[$event->getReceiverName()];
6465
if (null !==$this->logger) {
6566
$this->logger->info('Rejected message {class} will be sent to the failure transport {transport}.', [
6667
'class' =>\get_class($envelope->getMessage()),
67-
'transport' =>\get_class($this->failureSender),
68+
'transport' =>\get_class($failureSender),
6869
]);
6970
}
7071

71-
$this->failureSender->send($envelope);
72+
$failureSender->send($envelope);
7273
}
7374

7475
publicstaticfunctiongetSubscribedEvents()

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp