mirror of
https://github.com/Seldaek/monolog.git
synced 2025-08-07 05:36:45 +02:00
Merge remote-tracking branch 'msabramo/raven'
Conflicts: README.mdown composer.json
This commit is contained in:
@@ -117,6 +117,8 @@ Handlers
|
|||||||
- _CubeHandler_: Logs records to a [Cube](http://square.github.com/cube/) server.
|
- _CubeHandler_: Logs records to a [Cube](http://square.github.com/cube/) server.
|
||||||
- _CouchDBHandler_: Logs records to a CouchDB server.
|
- _CouchDBHandler_: Logs records to a CouchDB server.
|
||||||
- _DoctrineCouchDBHandler_: Logs records to a CouchDB server via the Doctrine CouchDB ODM.
|
- _DoctrineCouchDBHandler_: Logs records to a CouchDB server via the Doctrine CouchDB ODM.
|
||||||
|
- _RavenHandler_: Logs records to a [Sentry](http://getsentry.com/) server using
|
||||||
|
[raven](https://packagist.org/packages/raven/raven).
|
||||||
|
|
||||||
Wrappers / Special Handlers
|
Wrappers / Special Handlers
|
||||||
---------------------------
|
---------------------------
|
||||||
|
@@ -18,10 +18,12 @@
|
|||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"mlehner/gelf-php": "1.0.*",
|
"mlehner/gelf-php": "1.0.*",
|
||||||
|
"raven/raven": "0.2.*",
|
||||||
"doctrine/couchdb": "dev-master"
|
"doctrine/couchdb": "dev-master"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"mlehner/gelf-php": "Allow sending log messages to a GrayLog2 server",
|
"mlehner/gelf-php": "Allow sending log messages to a GrayLog2 server",
|
||||||
|
"raven/raven": "Allow sending log messages to a Sentry server",
|
||||||
"doctrine/couchdb": "Allow sending log messages to a CouchDB server",
|
"doctrine/couchdb": "Allow sending log messages to a CouchDB server",
|
||||||
"ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
|
"ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
|
||||||
"ext-mongo": "Allow sending log messages to a MongoDB server"
|
"ext-mongo": "Allow sending log messages to a MongoDB server"
|
||||||
|
70
src/Monolog/Handler/RavenHandler.php
Normal file
70
src/Monolog/Handler/RavenHandler.php
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the Monolog package.
|
||||||
|
*
|
||||||
|
* (c) Jordi Boggiano <j.boggiano@seld.be>
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Monolog\Handler;
|
||||||
|
|
||||||
|
use Monolog\Logger;
|
||||||
|
use Monolog\Handler\AbstractProcessingHandler;
|
||||||
|
use \Raven_Client;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handler to send messages to a Sentry (https://github.com/dcramer/sentry) server
|
||||||
|
* using raven-php (https://github.com/getsentry/raven-php)
|
||||||
|
*
|
||||||
|
* @author Marc Abramowitz <marc@marc-abramowitz.com>
|
||||||
|
*/
|
||||||
|
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
|
||||||
|
*/
|
||||||
|
protected $ravenClient;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Raven_Client $ravenClient
|
||||||
|
* @param integer $level The minimum logging level at which this handler will be triggered
|
||||||
|
* @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
|
||||||
|
*/
|
||||||
|
public function __construct(Raven_Client $ravenClient, $level = Logger::DEBUG, $bubble = true)
|
||||||
|
{
|
||||||
|
parent::__construct($level, $bubble);
|
||||||
|
|
||||||
|
$this->ravenClient = $ravenClient;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@inheritdoc}
|
||||||
|
*/
|
||||||
|
protected function write(array $record)
|
||||||
|
{
|
||||||
|
$this->ravenClient->captureMessage(
|
||||||
|
$record['formatted'],
|
||||||
|
array(), // $params - not used
|
||||||
|
$this->logLevels[$record['level']], // $level
|
||||||
|
false // $stack
|
||||||
|
);
|
||||||
|
if ($record['level'] >= Logger::ERROR && isset($record['context']['exception'])) {
|
||||||
|
$this->ravenClient->captureException($record['context']['exception']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
26
tests/Monolog/Handler/MockRavenClient.php
Normal file
26
tests/Monolog/Handler/MockRavenClient.php
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the Monolog package.
|
||||||
|
*
|
||||||
|
* (c) Jordi Boggiano <j.boggiano@seld.be>
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Monolog\Handler;
|
||||||
|
|
||||||
|
use Raven_Client;
|
||||||
|
|
||||||
|
class MockRavenClient extends Raven_Client
|
||||||
|
{
|
||||||
|
public function capture($data, $stack)
|
||||||
|
{
|
||||||
|
$this->lastData = $data;
|
||||||
|
$this->lastStack = $stack;
|
||||||
|
}
|
||||||
|
|
||||||
|
public $lastData;
|
||||||
|
public $lastStack;
|
||||||
|
}
|
93
tests/Monolog/Handler/RavenHandlerTest.php
Normal file
93
tests/Monolog/Handler/RavenHandlerTest.php
Normal file
@@ -0,0 +1,93 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the Monolog package.
|
||||||
|
*
|
||||||
|
* (c) Jordi Boggiano <j.boggiano@seld.be>
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Monolog\Handler;
|
||||||
|
|
||||||
|
use Monolog\TestCase;
|
||||||
|
use Monolog\Logger;
|
||||||
|
use Monolog\Handler\RavenHandler;
|
||||||
|
|
||||||
|
class RavenHandlerTest extends TestCase
|
||||||
|
{
|
||||||
|
public function setUp()
|
||||||
|
{
|
||||||
|
if (!class_exists("Raven_Client")) {
|
||||||
|
$this->markTestSkipped("raven/raven not installed");
|
||||||
|
}
|
||||||
|
|
||||||
|
require_once __DIR__ . '/MockRavenClient.php';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @covers Monolog\Handler\RavenHandler::__construct
|
||||||
|
*/
|
||||||
|
public function testConstruct()
|
||||||
|
{
|
||||||
|
$handler = new RavenHandler($this->getRavenClient());
|
||||||
|
$this->assertInstanceOf('Monolog\Handler\RavenHandler', $handler);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getHandler($ravenClient)
|
||||||
|
{
|
||||||
|
$handler = new RavenHandler($ravenClient);
|
||||||
|
return $handler;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getRavenClient()
|
||||||
|
{
|
||||||
|
$dsn = 'http://43f6017361224d098402974103bfc53d:a6a0538fc2934ba2bed32e08741b2cd3@marca.python.live.cheggnet.com:9000/1';
|
||||||
|
return new MockRavenClient($dsn);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testDebug()
|
||||||
|
{
|
||||||
|
$ravenClient = $this->getRavenClient();
|
||||||
|
$handler = $this->getHandler($ravenClient);
|
||||||
|
|
||||||
|
$record = $this->getRecord(Logger::DEBUG, "A test debug message");
|
||||||
|
$handler->handle($record);
|
||||||
|
|
||||||
|
$this->assertEquals($ravenClient::DEBUG, $ravenClient->lastData['level']);
|
||||||
|
$this->assertContains($record['message'], $ravenClient->lastData['message']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testWarning()
|
||||||
|
{
|
||||||
|
$ravenClient = $this->getRavenClient();
|
||||||
|
$handler = $this->getHandler($ravenClient);
|
||||||
|
|
||||||
|
$record = $this->getRecord(Logger::WARNING, "A test warning message");
|
||||||
|
$handler->handle($record);
|
||||||
|
|
||||||
|
$this->assertEquals($ravenClient::WARNING, $ravenClient->lastData['level']);
|
||||||
|
$this->assertContains($record['message'], $ravenClient->lastData['message']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testException()
|
||||||
|
{
|
||||||
|
$ravenClient = $this->getRavenClient();
|
||||||
|
$handler = $this->getHandler($ravenClient);
|
||||||
|
|
||||||
|
try {
|
||||||
|
$this->methodThatThrowsAnException();
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
$record = $this->getRecord(Logger::ERROR, $e->getMessage(), array('exception' => $e));
|
||||||
|
$handler->handle($record);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->assertEquals($record['message'], $ravenClient->lastData['message']);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function methodThatThrowsAnException()
|
||||||
|
{
|
||||||
|
throw new \Exception('This is an exception');
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user