mirror of
https://github.com/Seldaek/monolog.git
synced 2025-10-23 17:46:09 +02:00
Merge branch '1.x'
This commit is contained in:
@@ -11,7 +11,7 @@
|
||||
|
||||
namespace Monolog\Formatter;
|
||||
|
||||
use Exception;
|
||||
use Throwable;
|
||||
|
||||
/**
|
||||
* Encodes whatever record data is passed to it as json
|
||||
@@ -156,7 +156,7 @@ class JsonFormatter extends NormalizerFormatter
|
||||
return $normalized;
|
||||
}
|
||||
|
||||
if ($data instanceof Exception) {
|
||||
if ($data instanceof Throwable) {
|
||||
return $this->normalizeException($data);
|
||||
}
|
||||
|
||||
@@ -171,7 +171,7 @@ class JsonFormatter extends NormalizerFormatter
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
protected function normalizeException(\Throwable $e)
|
||||
protected function normalizeException(Throwable $e)
|
||||
{
|
||||
$data = [
|
||||
'class' => get_class($e),
|
||||
|
@@ -179,7 +179,7 @@ class RavenHandler extends AbstractProcessingHandler
|
||||
$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'];
|
||||
$this->ravenClient->captureException($record['context']['exception'], $options);
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user