From 78282ae704aacb42931673b7936ab5aaaea4370d Mon Sep 17 00:00:00 2001 From: David Marland Date: Mon, 24 May 2021 12:09:44 +0100 Subject: [PATCH 1/2] ResetServicesExtension to run _after_ message received Resolves https://github.com/php-enqueue/enqueue-dev/issues/1156 Reset the services after message is received, so that logs are flushed without having to wait for a new message --- .../Consumption/Extension/ResetServicesExtension.php | 8 ++++---- .../Consumption/Extension/ResetServicesExtensionTest.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/enqueue-bundle/Consumption/Extension/ResetServicesExtension.php b/pkg/enqueue-bundle/Consumption/Extension/ResetServicesExtension.php index 36eb21782..0bf642197 100644 --- a/pkg/enqueue-bundle/Consumption/Extension/ResetServicesExtension.php +++ b/pkg/enqueue-bundle/Consumption/Extension/ResetServicesExtension.php @@ -2,11 +2,11 @@ namespace Enqueue\Bundle\Consumption\Extension; -use Enqueue\Consumption\Context\MessageReceived; -use Enqueue\Consumption\MessageReceivedExtensionInterface; +use Enqueue\Consumption\Context\PostMessageReceived; +use Enqueue\Consumption\PostMessageReceivedExtensionInterface; use Symfony\Component\HttpKernel\DependencyInjection\ServicesResetter; -class ResetServicesExtension implements MessageReceivedExtensionInterface +class ResetServicesExtension implements PostMessageReceivedExtensionInterface { /** * @var ServicesResetter @@ -18,7 +18,7 @@ public function __construct(ServicesResetter $resetter) $this->resetter = $resetter; } - public function onMessageReceived(MessageReceived $context): void + public function onPostMessageReceived(PostMessageReceived $context): void { $context->getLogger()->debug('[ResetServicesExtension] Resetting services.'); diff --git a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/ResetServicesExtensionTest.php b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/ResetServicesExtensionTest.php index bfd772a5c..8d8d3c585 100644 --- a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/ResetServicesExtensionTest.php +++ b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/ResetServicesExtensionTest.php @@ -37,7 +37,7 @@ public function testItShouldResetServices() ; $extension = new ResetServicesExtension($resetter); - $extension->onMessageReceived($context); + $extension->onPostMessageReceived($context); } protected function createContext(): MessageReceived From c24953a62d85978d0072bd770f9edaa6a4a4c8a0 Mon Sep 17 00:00:00 2001 From: David Marland Date: Tue, 25 May 2021 12:32:51 +0100 Subject: [PATCH 2/2] Fix test --- .../Consumption/Extension/ResetServicesExtensionTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/ResetServicesExtensionTest.php b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/ResetServicesExtensionTest.php index 8d8d3c585..18e94f251 100644 --- a/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/ResetServicesExtensionTest.php +++ b/pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/ResetServicesExtensionTest.php @@ -4,7 +4,7 @@ use Doctrine\Persistence\ManagerRegistry; use Enqueue\Bundle\Consumption\Extension\ResetServicesExtension; -use Enqueue\Consumption\Context\MessageReceived; +use Enqueue\Consumption\Context\PostMessageReceived; use Interop\Queue\Consumer; use Interop\Queue\Context as InteropContext; use Interop\Queue\Message; @@ -40,9 +40,9 @@ public function testItShouldResetServices() $extension->onPostMessageReceived($context); } - protected function createContext(): MessageReceived + protected function createContext(): PostMessageReceived { - return new MessageReceived( + return new PostMessageReceived( $this->createMock(InteropContext::class), $this->createMock(Consumer::class), $this->createMock(Message::class),