[Messenger] Use "warning" intead of "error" log level for RecoverableException

lyrixx · lyrixx · commit a885ba844dc9 · 2020-12-08T11:59:01.000+01:00
diff --git a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php
@@ -12,6 +12,7 @@
 
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
+use Psr\Log\LogLevel;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Event\WorkerMessageFailedEvent;
@@ -70,7 +71,18 @@ public function onMessageFailed(WorkerMessageFailedEvent $event)
             $delay = $retryStrategy->getWaitingTime($envelope, $throwable);
 
             if (null !== $this->logger) {
-                $this->logger->error('Error thrown while handling message {class}. Sending for retry #{retryCount} using {delay} ms delay. Error: "{error}"', $context + ['retryCount' => $retryCount, 'delay' => $delay, 'error' => $throwable->getMessage(), 'exception' => $throwable]);
+                $logLevel = LogLevel::ERROR;
+                if ($throwable instanceof RecoverableExceptionInterface) {
+                    $logLevel = LogLevel::WARNING;
+                } elseif ($throwable instanceof HandlerFailedException) {
+                    foreach ($throwable->getNestedExceptions() as $nestedException) {
+                        if ($nestedException instanceof RecoverableExceptionInterface) {
+                            $logLevel = LogLevel::WARNING;
+                            break;
+                        }
+                    }
+                }
+                $this->logger->log($logLevel, 'Error thrown while handling message {class}. Sending for retry #{retryCount} using {delay} ms delay. Error: "{error}"', $context + ['retryCount' => $retryCount, 'delay' => $delay, 'error' => $throwable->getMessage(), 'exception' => $throwable]);
             }
 
             // add the delay and retry stamp info
