From 041b936b831e2c725b92b4b25fb63a879a69edd1 Mon Sep 17 00:00:00 2001
From: David Windell <david@outeredgeuk.com>
Date: Fri, 24 May 2013 18:09:40 +0200
Subject: [PATCH 1/4] Don't log exceptions twice

---
 src/Monolog/Handler/RavenHandler.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Monolog/Handler/RavenHandler.php b/src/Monolog/Handler/RavenHandler.php
index a9ea4fad..26331256 100644
--- a/src/Monolog/Handler/RavenHandler.php
+++ b/src/Monolog/Handler/RavenHandler.php
@@ -71,15 +71,17 @@ class RavenHandler extends AbstractProcessingHandler
             $options['extra']['extra'] = $record['extra'];
         }
 
+        if ($record['level'] >= Logger::ERROR && isset($record['context']['exception'])) {
+            $this->ravenClient->captureException($record['context']['exception']);
+            return;
+        }
+
         $this->ravenClient->captureMessage(
             $record['formatted'],
             array(),                                                                  // $params - not used
             version_compare(Raven_Client::VERSION, '0.1.0', '>') ? $options : $level, // $level or $options
             false                                                                     // $stack
         );
-        if ($record['level'] >= Logger::ERROR && isset($record['context']['exception'])) {
-            $this->ravenClient->captureException($record['context']['exception']);
-        }
     }
 
     /**

From 3556ae73165528dd4e45d53f858deaa906056956 Mon Sep 17 00:00:00 2001
From: David Windell <david@outeredgeuk.com>
Date: Fri, 24 May 2013 19:10:15 +0200
Subject: [PATCH 2/4] Tidy up handler

---
 src/Monolog/Handler/RavenHandler.php | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/Monolog/Handler/RavenHandler.php b/src/Monolog/Handler/RavenHandler.php
index 26331256..d6c58441 100644
--- a/src/Monolog/Handler/RavenHandler.php
+++ b/src/Monolog/Handler/RavenHandler.php
@@ -60,10 +60,8 @@ class RavenHandler extends AbstractProcessingHandler
      */
     protected function write(array $record)
     {
-        $level = $this->logLevels[$record['level']];
-
         $options = array();
-        $options['level'] = $level;
+        $options['level'] = $this->logLevels[$record['level']];
         if (!empty($record['context'])) {
             $options['extra']['context'] = $record['context'];
         }
@@ -71,17 +69,13 @@ class RavenHandler extends AbstractProcessingHandler
             $options['extra']['extra'] = $record['extra'];
         }
 
-        if ($record['level'] >= Logger::ERROR && isset($record['context']['exception'])) {
-            $this->ravenClient->captureException($record['context']['exception']);
+        if (isset($record['context']['exception']) && $record['context']['exception'] instanceof \Exception) {
+            $options['extra']['message'] = $record['formatted'];
+            $this->ravenClient->captureException($record['context']['exception'], $options);
             return;
         }
 
-        $this->ravenClient->captureMessage(
-            $record['formatted'],
-            array(),                                                                  // $params - not used
-            version_compare(Raven_Client::VERSION, '0.1.0', '>') ? $options : $level, // $level or $options
-            false                                                                     // $stack
-        );
+        $this->ravenClient->captureMessage($record['formatted'], array(), $options);
     }
 
     /**

From 9e49043f88b54deb5594305ca484edd3c5938f08 Mon Sep 17 00:00:00 2001
From: David Windell <david@outeredgeuk.com>
Date: Tue, 28 May 2013 11:50:11 +0200
Subject: [PATCH 3/4] Bump raven version

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ea3e7c12..c89e1886 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
     },
     "require-dev": {
         "mlehner/gelf-php": "1.0.*",
-        "raven/raven": "0.3.*",
+        "raven/raven": "0.5.*",
         "doctrine/couchdb": "dev-master"
     },
     "suggest": {

From 94e31e37b8c3dc702ee5b0ce197f43223bc6c9ca Mon Sep 17 00:00:00 2001
From: David Windell <david@outeredgeuk.com>
Date: Tue, 28 May 2013 11:50:42 +0200
Subject: [PATCH 4/4] API match

---
 tests/Monolog/Handler/MockRavenClient.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Monolog/Handler/MockRavenClient.php b/tests/Monolog/Handler/MockRavenClient.php
index f1f54a8f..fbaab9bc 100644
--- a/tests/Monolog/Handler/MockRavenClient.php
+++ b/tests/Monolog/Handler/MockRavenClient.php
@@ -15,7 +15,7 @@ use Raven_Client;
 
 class MockRavenClient extends Raven_Client
 {
-    public function capture($data, $stack)
+    public function capture($data, $stack, $vars = null)
     {
         $this->lastData = $data;
         $this->lastStack = $stack;