diff --git a/src/Monolog/Formatter/RavenFormatter.php b/src/Monolog/Formatter/RavenFormatter.php index 7fdc40f3..23168d8d 100644 --- a/src/Monolog/Formatter/RavenFormatter.php +++ b/src/Monolog/Formatter/RavenFormatter.php @@ -21,28 +21,11 @@ use Raven_Client; */ class RavenFormatter extends NormalizerFormatter { - /** - * Translates Monolog log levels to Raven log levels. - */ - private $logLevels = array( - Logger::DEBUG => Raven_Client::DEBUG, - Logger::INFO => Raven_Client::INFO, - Logger::WARNING => Raven_Client::WARNING, - Logger::ERROR => Raven_Client::ERROR, - Logger::CRITICAL => Raven_Client::ERROR, - Logger::ALERT => Raven_Client::ERROR, - ); - /** * {@inheritdoc} */ public function format(array $record) { - $record = parent::format($record); - - $record['level'] = $this->logLevels[$record['level']]; - $record['message'] = $record['channel'] . ': ' . $record['message']; - - return $record; + return $record['channel'] . ': ' . $record['message']; } } diff --git a/src/Monolog/Handler/RavenHandler.php b/src/Monolog/Handler/RavenHandler.php index 37a2d265..3f8fede2 100644 --- a/src/Monolog/Handler/RavenHandler.php +++ b/src/Monolog/Handler/RavenHandler.php @@ -24,6 +24,18 @@ use \Raven_Client; */ class RavenHandler extends AbstractProcessingHandler { + /** + * Translates Monolog log levels to Raven log levels. + */ + private $logLevels = array( + Logger::DEBUG => Raven_Client::DEBUG, + Logger::INFO => Raven_Client::INFO, + Logger::WARNING => Raven_Client::WARNING, + Logger::ERROR => Raven_Client::ERROR, + Logger::CRITICAL => Raven_Client::ERROR, + Logger::ALERT => Raven_Client::ERROR, + ); + /** * @var Raven_Client the client object that sends the message to the server */ @@ -54,15 +66,14 @@ class RavenHandler extends AbstractProcessingHandler */ protected function write(array $record) { + $this->ravenClient->captureMessage( + $record['formatted'], + $record['formatted'], // $params + $this->logLevels[$record['level']], // $level + false // $stack + ); if ($record['level'] >= Logger::ERROR && isset($record['context']['exception'])) { $this->ravenClient->captureException($record['context']['exception']); - } else { - $this->ravenClient->captureMessage( - $record['formatted']['message'], - $record, // $params - $record['formatted']['level'], // $level - true // $stack - ); } }