From a4033bf3d6087a6a0ccbcfd10700eee839c74636 Mon Sep 17 00:00:00 2001 From: Moshe Brevda Date: Sun, 23 Aug 2015 00:06:48 +0300 Subject: [PATCH 1/4] Pass context to RollBar --- src/Monolog/Handler/RollbarHandler.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Monolog/Handler/RollbarHandler.php b/src/Monolog/Handler/RollbarHandler.php index 42b73606..0a5e4c39 100644 --- a/src/Monolog/Handler/RollbarHandler.php +++ b/src/Monolog/Handler/RollbarHandler.php @@ -54,7 +54,9 @@ class RollbarHandler extends AbstractProcessingHandler protected function write(array $record) { if (isset($record['context']['exception']) && $record['context']['exception'] instanceof Exception) { - $this->rollbarNotifier->report_exception($record['context']['exception']); + $context = $record['context']; + unset($context['exception']); + $this->rollbarNotifier->report_exception($record['context']['exception'], $context); } else { $extraData = array( 'level' => $record['level'], From 2719cca77f14c5031b09375b73664969cc65b287 Mon Sep 17 00:00:00 2001 From: Moshe Brevda Date: Sun, 23 Aug 2015 02:03:17 +0300 Subject: [PATCH 2/4] Add payload, too --- src/Monolog/Handler/RollbarHandler.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Monolog/Handler/RollbarHandler.php b/src/Monolog/Handler/RollbarHandler.php index 0a5e4c39..0521ee66 100644 --- a/src/Monolog/Handler/RollbarHandler.php +++ b/src/Monolog/Handler/RollbarHandler.php @@ -56,7 +56,13 @@ class RollbarHandler extends AbstractProcessingHandler if (isset($record['context']['exception']) && $record['context']['exception'] instanceof Exception) { $context = $record['context']; unset($context['exception']); - $this->rollbarNotifier->report_exception($record['context']['exception'], $context); + + $payload = isset($context['payload']) ? $context['payload'] : []; + if ($context['payload']) { + unset($context['payload']); + } + + $this->rollbarNotifier->report_exception($record['context']['exception'], $context, $payload); } else { $extraData = array( 'level' => $record['level'], From fd4687b0894c15e8c72870208ba1815d8a0e4894 Mon Sep 17 00:00:00 2001 From: Moshe Brevda Date: Thu, 27 Aug 2015 09:44:55 +0300 Subject: [PATCH 3/4] Better variable handling --- src/Monolog/Handler/RollbarHandler.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Monolog/Handler/RollbarHandler.php b/src/Monolog/Handler/RollbarHandler.php index 0521ee66..04ec06ee 100644 --- a/src/Monolog/Handler/RollbarHandler.php +++ b/src/Monolog/Handler/RollbarHandler.php @@ -55,14 +55,15 @@ class RollbarHandler extends AbstractProcessingHandler { if (isset($record['context']['exception']) && $record['context']['exception'] instanceof Exception) { $context = $record['context']; + $exception = $context['exception'] unset($context['exception']); $payload = isset($context['payload']) ? $context['payload'] : []; - if ($context['payload']) { + if (isset($context['payload'])) { unset($context['payload']); } - $this->rollbarNotifier->report_exception($record['context']['exception'], $context, $payload); + $this->rollbarNotifier->report_exception($exception, $context, $payload); } else { $extraData = array( 'level' => $record['level'], From dce930e43d9f0298375114103809d6f5b048d19a Mon Sep 17 00:00:00 2001 From: Moshe Brevda Date: Thu, 27 Aug 2015 09:47:53 +0300 Subject: [PATCH 4/4] Fix syntax --- src/Monolog/Handler/RollbarHandler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Monolog/Handler/RollbarHandler.php b/src/Monolog/Handler/RollbarHandler.php index 04ec06ee..7a58cee7 100644 --- a/src/Monolog/Handler/RollbarHandler.php +++ b/src/Monolog/Handler/RollbarHandler.php @@ -54,8 +54,8 @@ class RollbarHandler extends AbstractProcessingHandler protected function write(array $record) { if (isset($record['context']['exception']) && $record['context']['exception'] instanceof Exception) { - $context = $record['context']; - $exception = $context['exception'] + $context = $record; + $exception = $context['exception']; unset($context['exception']); $payload = isset($context['payload']) ? $context['payload'] : [];