From 211a324e8921dfaf9e46d0e0181a5d529d1f744c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Mleczko?= Date: Tue, 5 Aug 2025 21:18:08 +0200 Subject: [PATCH] feat: Drop exception catching and logging, fix retry and failure handling by default messenger way --- .../DependencyInjection/SwooleExtension.php | 8 ----- .../Bundle/Resources/config/services.php | 8 ----- .../ExceptionLoggingTransportHandler.php | 35 ------------------- 3 files changed, 51 deletions(-) delete mode 100644 src/Bridge/Symfony/Messenger/ExceptionLoggingTransportHandler.php diff --git a/src/Bridge/Symfony/Bundle/DependencyInjection/SwooleExtension.php b/src/Bridge/Symfony/Bundle/DependencyInjection/SwooleExtension.php index f235c47..0cc073c 100644 --- a/src/Bridge/Symfony/Bundle/DependencyInjection/SwooleExtension.php +++ b/src/Bridge/Symfony/Bundle/DependencyInjection/SwooleExtension.php @@ -24,7 +24,6 @@ use SwooleBundle\SwooleBundle\Bridge\Symfony\HttpKernel\ContextReleasingHttpKernelRequestHandler; use SwooleBundle\SwooleBundle\Bridge\Symfony\HttpKernel\CoroutineKernelPool; use SwooleBundle\SwooleBundle\Bridge\Symfony\HttpKernel\KernelPool; -use SwooleBundle\SwooleBundle\Bridge\Symfony\Messenger\ExceptionLoggingTransportHandler; use SwooleBundle\SwooleBundle\Bridge\Symfony\Messenger\ServiceResettingTransportHandler; use SwooleBundle\SwooleBundle\Bridge\Tideways\Apm\Apm; use SwooleBundle\SwooleBundle\Bridge\Tideways\Apm\RequestDataProvider; @@ -659,13 +658,6 @@ private function configureTaskWorker(array $config, ContainerBuilder $container) */ private function configureTaskWorkerServices(array $config, ContainerBuilder $container): void { - $loggingHandler = $container->findDefinition(ExceptionLoggingTransportHandler::class); - $loggingHandler->setArgument( - '$decorated', - new Reference(ExceptionLoggingTransportHandler::class . '.inner') - ); - $loggingHandler->setDecoratedService(TaskHandler::class, null, -9998); - if (!$config['reset_handler']) { return; } diff --git a/src/Bridge/Symfony/Bundle/Resources/config/services.php b/src/Bridge/Symfony/Bundle/Resources/config/services.php index 4fcd0fc..cf52dea 100644 --- a/src/Bridge/Symfony/Bundle/Resources/config/services.php +++ b/src/Bridge/Symfony/Bundle/Resources/config/services.php @@ -41,7 +41,6 @@ use SwooleBundle\SwooleBundle\Bridge\Symfony\HttpKernel\HttpKernelRequestHandler; use SwooleBundle\SwooleBundle\Bridge\Symfony\HttpKernel\KernelPool; use SwooleBundle\SwooleBundle\Bridge\Symfony\HttpKernel\SimpleKernelPool; -use SwooleBundle\SwooleBundle\Bridge\Symfony\Messenger\ExceptionLoggingTransportHandler; use SwooleBundle\SwooleBundle\Bridge\Symfony\Messenger\ServiceResettingTransportHandler; use SwooleBundle\SwooleBundle\Common\Adapter\Swoole; use SwooleBundle\SwooleBundle\Common\System\Extension; @@ -281,13 +280,6 @@ $services->set(TaskFinishedHandler::class, NoOpTaskFinishedHandler::class); - $services->set(ExceptionLoggingTransportHandler::class) - ->arg('$decorated', null) - ->arg('$logger', service('logger')) - ->tag('monolog.logger', [ - 'channel' => 'swoole', - ]); - $services->set(ServiceResettingTransportHandler::class) ->arg('$decorated', null) ->arg('$resetter', service('services_resetter')); diff --git a/src/Bridge/Symfony/Messenger/ExceptionLoggingTransportHandler.php b/src/Bridge/Symfony/Messenger/ExceptionLoggingTransportHandler.php deleted file mode 100644 index 0186078..0000000 --- a/src/Bridge/Symfony/Messenger/ExceptionLoggingTransportHandler.php +++ /dev/null @@ -1,35 +0,0 @@ -decorated->handle($server, $task); - } catch (Throwable $e) { - $this->logger->critical( - sprintf('Task worker exception: %s', $e->getMessage()), - [ - 'exception' => $e, - ] - ); - } - } -}