bug #52075 [Messenger] Fix DoctrineOpenTransactionLoggerMiddleware (ro0NL)

nicolas-grekas · nicolas-grekas · commit d28330faaadb · 2023-10-16T16:57:22.000+02:00
This PR was squashed before being merged into the 5.4 branch. Discussion ---------- [Messenger] Fix DoctrineOpenTransactionLoggerMiddleware | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #...  | License | MIT When a message is routed via `sync://` we hit the middleware stack twice (meh, but OK). A side effect is we always get an error log due open transaction, even though it was closed properly. But it's an inner transaction. This solves it. Commits ------- fa661b5 [Messenger] Fix DoctrineOpenTransactionLoggerMiddleware
diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineOpenTransactionLoggerMiddleware.php b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineOpenTransactionLoggerMiddleware.php
@@ -26,6 +26,8 @@
 class DoctrineOpenTransactionLoggerMiddleware extends AbstractDoctrineMiddleware
 {
     private $logger;
+    /** @var bool */
+    private $isHandling = false;
 
     public function __construct(ManagerRegistry $managerRegistry, string $entityManagerName = null, LoggerInterface $logger = null)
     {
@@ -36,6 +38,12 @@ public function __construct(ManagerRegistry $managerRegistry, string $entityMana
 
     protected function handleForManager(EntityManagerInterface $entityManager, Envelope $envelope, StackInterface $stack): Envelope
     {
+        if ($this->isHandling) {
+            return $stack->next()->handle($envelope, $stack);
+        }
+
+        $this->isHandling = true;
+
         try {
             return $stack->next()->handle($envelope, $stack);
         } finally {
@@ -44,6 +52,7 @@ protected function handleForManager(EntityManagerInterface $entityManager, Envel
                     'message' => $envelope->getMessage(),
                 ]);
             }
+            $this->isHandling = false;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@`
`26`	`26`	`class DoctrineOpenTransactionLoggerMiddleware extends AbstractDoctrineMiddleware`
`27`	`27`	`{`
`28`	`28`	`private $logger;`
	`29`	`+ /** @var bool */`
	`30`	`+ private $isHandling = false;`
`29`	`31`
`30`	`32`	`public function __construct(ManagerRegistry $managerRegistry, string $entityManagerName = null, LoggerInterface $logger = null)`
`31`	`33`	`{`
`@@ -36,6 +38,12 @@ public function __construct(ManagerRegistry $managerRegistry, string $entityMana`
`36`	`38`
`37`	`39`	`protected function handleForManager(EntityManagerInterface $entityManager, Envelope $envelope, StackInterface $stack): Envelope`
`38`	`40`	`{`
	`41`	`+ if ($this->isHandling) {`
	`42`	`+ return $stack->next()->handle($envelope, $stack);`
	`43`	`+ }`
	`44`	`+`
	`45`	`+ $this->isHandling = true;`
	`46`	`+`
`39`	`47`	`try {`
`40`	`48`	`return $stack->next()->handle($envelope, $stack);`
`41`	`49`	`} finally {`
`@@ -44,6 +52,7 @@ protected function handleForManager(EntityManagerInterface $entityManager, Envel`
`44`	`52`	`'message' => $envelope->getMessage(),`
`45`	`53`	`]);`
`46`	`54`	`}`
	`55`	`+ $this->isHandling = false;`
`47`	`56`	`}`
`48`	`57`	`}`
`49`	`58`	`}`