mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-06 13:16:39 +02:00
Code Issues Releases Wiki Activity

Merge branch '1.x'

Browse Source
This commit is contained in:
Jordi Boggiano
2016-09-18 18:10:42 +02:00
parent 1b5d46fc52 dacec2fe1e
commit ec945b60d4
3 changed files with 87 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Monolog/Formatter/JsonFormatter.php
View File

@@ -11,7 +11,7 @@
namespace Monolog\Formatter; namespace Monolog\Formatter;
use Exception; use Throwable;
/** /**
* Encodes whatever record data is passed to it as json * Encodes whatever record data is passed to it as json
@@ -156,7 +156,7 @@ class JsonFormatter extends NormalizerFormatter
return $normalized; return $normalized;
} }
if ($data instanceof Exception) { if ($data instanceof Throwable) {
return $this->normalizeException($data); return $this->normalizeException($data);
} }
@@ -171,7 +171,7 @@ class JsonFormatter extends NormalizerFormatter
* *
* @return array * @return array
*/ */
protected function normalizeException(\Throwable $e) protected function normalizeException(Throwable $e)
{ {
$data = [ $data = [
'class' => get_class($e), 'class' => get_class($e),

2
src/Monolog/Handler/RavenHandler.php
View File

@@ -179,7 +179,7 @@ class RavenHandler extends AbstractProcessingHandler
$options['release'] = $this->release; $options['release'] = $this->release;
} }
if (isset($record['context']['exception']) && $record['context']['exception'] instanceof \Exception) { if (isset($record['context']['exception']) && ($record['context']['exception'] instanceof \Exception || (PHP_VERSION_ID >= 70000 && $record['context']['exception'] instanceof \Throwable))) {
$options['extra']['message'] = $record['formatted']; $options['extra']['message'] = $record['formatted'];
$this->ravenClient->captureException($record['context']['exception'], $options); $this->ravenClient->captureException($record['context']['exception'], $options);
} else { } else {

110
tests/Monolog/Formatter/JsonFormatterTest.php
View File

@@ -80,43 +80,99 @@ class JsonFormatterTest extends TestCase
{ {
$formatter = new JsonFormatter(); $formatter = new JsonFormatter();
$exception = new \RuntimeException('Foo'); $exception = new \RuntimeException('Foo');
$message = $formatter->format([ $formattedException = $this->formatException($exception);
'level_name' => 'CRITICAL',
'channel' => 'core',
'context' => ['exception' => $exception],
'datetime' => new \DateTimeImmutable(),
'extra' => [],
'message' => 'foobar',
]);
if (version_compare(PHP_VERSION, '5.4.0', '>=')) { $message = $this->formatRecordWithExceptionInContext($formatter, $exception);
$path = substr(json_encode($exception->getFile(), JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), 1, -1);
} else { $this->assertContextContainsFormattedException($formattedException, $message);
$path = substr(json_encode($exception->getFile()), 1, -1);
}
$this->assertEquals('{"level_name":"CRITICAL","channel":"core","context":{"exception":{"class":"RuntimeException","message":"'.$exception->getMessage().'","code":'.$exception->getCode().',"file":"'.$path.':'.$exception->getLine().'"}},"datetime":'.json_encode(new \DateTimeImmutable()).',"extra":[],"message":"foobar"}'."\n", $message);
} }
public function testDefFormatWithPreviousException() public function testDefFormatWithPreviousException()
{ {
$formatter = new JsonFormatter(); $formatter = new JsonFormatter();
$exception = new \RuntimeException('Foo', 0, new \LogicException('Wut?')); $exception = new \RuntimeException('Foo', 0, new \LogicException('Wut?'));
$message = $formatter->format([ $formattedPrevException = $this->formatException($exception->getPrevious());
$formattedException = $this->formatException($exception, $formattedPrevException);
$message = $this->formatRecordWithExceptionInContext($formatter, $exception);
$this->assertContextContainsFormattedException($formattedException, $message);
}
public function testDefFormatWithThrowable()
{
$formatter = new JsonFormatter();
$throwable = new \Error('Foo');
$formattedThrowable = $this->formatException($throwable);
$message = $this->formatRecordWithExceptionInContext($formatter, $throwable);
$this->assertContextContainsFormattedException($formattedThrowable, $message);
}
/**
* @param string $expected
* @param string $actual
*
* @internal param string $exception
*/
private function assertContextContainsFormattedException($expected, $actual)
{
$this->assertEquals(
'{"level_name":"CRITICAL","channel":"core","context":{"exception":'.$expected.'},"datetime":null,"extra":[],"message":"foobar"}'."\n",
$actual
);
}
/**
* @param JsonFormatter $formatter
* @param \Exception|\Throwable $exception
*
* @return string
*/
private function formatRecordWithExceptionInContext(JsonFormatter $formatter, $exception)
{
$message = $formatter->format(array(
'level_name' => 'CRITICAL', 'level_name' => 'CRITICAL',
'channel' => 'core', 'channel' => 'core',
'context' => ['exception' => $exception], 'context' => array('exception' => $exception),
'datetime' => new \DateTimeImmutable(), 'datetime' => null,
'extra' => [], 'extra' => array(),
'message' => 'foobar', 'message' => 'foobar',
]); ));
return $message;
}
if (version_compare(PHP_VERSION, '5.4.0', '>=')) { /**
$pathPrevious = substr(json_encode($exception->getPrevious()->getFile(), JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), 1, -1); * @param \Exception|\Throwable $exception
$pathException = substr(json_encode($exception->getFile(), JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), 1, -1); *
} else { * @return string
$pathPrevious = substr(json_encode($exception->getPrevious()->getFile()), 1, -1); */
$pathException = substr(json_encode($exception->getFile()), 1, -1); private function formatExceptionFilePathWithLine($exception)
} {
$this->assertEquals('{"level_name":"CRITICAL","channel":"core","context":{"exception":{"class":"RuntimeException","message":"'.$exception->getMessage().'","code":'.$exception->getCode().',"file":"'.$pathException.':'.$exception->getLine().'","previous":{"class":"LogicException","message":"'.$exception->getPrevious()->getMessage().'","code":'.$exception->getPrevious()->getCode().',"file":"'.$pathPrevious.':'.$exception->getPrevious()->getLine().'"}}},"datetime":'.json_encode(new \DateTimeImmutable()).',"extra":[],"message":"foobar"}'."\n", $message); $options = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
$path = substr(json_encode($exception->getFile(), $options), 1, -1);
return $path . ':' . $exception->getLine();
}
/**
* @param \Exception|\Throwable $exception
*
* @param null|string $previous
*
* @return string
*/
private function formatException($exception, $previous = null)
{
$formattedException =
'{"class":"' . get_class($exception) .
'","message":"' . $exception->getMessage() .
'","code":' . $exception->getCode() .
',"file":"' . $this->formatExceptionFilePathWithLine($exception) .
($previous ? '","previous":' . $previous : '"') .
'}';
return $formattedException;
} }
} }