From 443ead01249ce8da4466bf60dfd9e95337030496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Tou=C5=A1ek?= Date: Thu, 12 Mar 2020 12:32:21 +0100 Subject: [PATCH 1/3] Update services.yml --- Resources/config/services.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/config/services.yml b/Resources/config/services.yml index 37f1c65..d96869c 100755 --- a/Resources/config/services.yml +++ b/Resources/config/services.yml @@ -4,11 +4,14 @@ services: arguments: - '@service_container' - Rollbar\Monolog\Handler\RollbarHandler: + Monolog\Handler\RollbarHandler: factory: ['@Rollbar\Symfony\RollbarBundle\Factories\RollbarHandlerFactory', createRollbarHandler] tags: - { name: monolog.logger, channel: rollbar } + Rollbar\Monolog\Handler\RollbarHandler: + alias: Monolog\Handler\RollbarHandler + Rollbar\Symfony\RollbarBundle\Payload\Generator: arguments: - '@service_container' From 804e0a9e17a996bf8a7d8001fee823bc52373dcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Tou=C5=A1ek?= Date: Thu, 12 Mar 2020 12:36:17 +0100 Subject: [PATCH 2/3] Update RollbarHandlerFactory.php --- Factories/RollbarHandlerFactory.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Factories/RollbarHandlerFactory.php b/Factories/RollbarHandlerFactory.php index b9ea050..421eaff 100755 --- a/Factories/RollbarHandlerFactory.php +++ b/Factories/RollbarHandlerFactory.php @@ -3,6 +3,8 @@ namespace Rollbar\Symfony\RollbarBundle\Factories; use Psr\Log\LogLevel; +use Monolog\Handler\Handler; +use Monolog\Handler\RollbarHandler as MonologRollbarHandler; use Rollbar\Monolog\Handler\RollbarHandler; use Rollbar\Rollbar; use Rollbar\Symfony\RollbarBundle\DependencyInjection\RollbarExtension; @@ -52,10 +54,14 @@ public function __construct(ContainerInterface $container) /** * Create RollbarHandler * - * @return RollbarHandler + * @return Handler */ - public function createRollbarHandler(): RollbarHandler + public function createRollbarHandler(): Handler { + if (class_exists(MonologRollbarHandler::class)) { + return new MonologRollbarHandler(Rollbar::logger(), LogLevel::ERROR); + } + return new RollbarHandler(Rollbar::logger(), LogLevel::ERROR); } } From cea25d0e443c797469a05d86f86735c47c5ef03e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Tou=C5=A1ek?= Date: Thu, 12 Mar 2020 12:46:15 +0100 Subject: [PATCH 3/3] Update RollbarHandlerFactory.php --- Factories/RollbarHandlerFactory.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Factories/RollbarHandlerFactory.php b/Factories/RollbarHandlerFactory.php index 421eaff..a0c224a 100755 --- a/Factories/RollbarHandlerFactory.php +++ b/Factories/RollbarHandlerFactory.php @@ -4,8 +4,8 @@ use Psr\Log\LogLevel; use Monolog\Handler\Handler; -use Monolog\Handler\RollbarHandler as MonologRollbarHandler; -use Rollbar\Monolog\Handler\RollbarHandler; +use Monolog\Handler\RollbarHandler; +use Rollbar\Monolog\Handler\RollbarHandler as LegacyRollbarHandler; use Rollbar\Rollbar; use Rollbar\Symfony\RollbarBundle\DependencyInjection\RollbarExtension; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -58,8 +58,8 @@ public function __construct(ContainerInterface $container) */ public function createRollbarHandler(): Handler { - if (class_exists(MonologRollbarHandler::class)) { - return new MonologRollbarHandler(Rollbar::logger(), LogLevel::ERROR); + if (! class_exists(RollbarHandler::class)) { + return new LegacyRollbarHandler(Rollbar::logger(), LogLevel::ERROR); } return new RollbarHandler(Rollbar::logger(), LogLevel::ERROR);