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

Add graylog2/gelf-php 2.x support, fixes #1747

Browse Source
This commit is contained in:
Jordi Boggiano
2022-08-20 14:09:11 +02:00
parent 132eace138
commit 5eccd17dc5
5 changed files with 84 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
tests/Monolog/Formatter/GelfMessageFormatterTest.php
View File

@@ -11,6 +11,7 @@
namespace Monolog\Formatter;
use Gelf\Message;
use Monolog\Logger;
use PHPUnit\Framework\TestCase;
@@ -44,9 +45,13 @@ class GelfMessageFormatterTest extends TestCase
$this->assertInstanceOf('Gelf\Message', $message);
$this->assertEquals(0, $message->getTimestamp());
$this->assertEquals('log', $message->getShortMessage());
$this->assertEquals('meh', $message->getFacility());
$this->assertEquals(null, $message->getLine());
$this->assertEquals(null, $message->getFile());
if (self::isGelfVersion1()) {
$this->assertEquals('meh', $message->getFacility());
$this->assertEquals(null, $message->getLine());
$this->assertEquals(null, $message->getFile());
} else {
$this->assertEquals('meh', $message->getAdditional('channel'));
}
$this->assertEquals($this->isLegacy() ? 3 : 'error', $message->getLevel());
$this->assertNotEmpty($message->getHost());
@@ -77,8 +82,13 @@ class GelfMessageFormatterTest extends TestCase
$message = $formatter->format($record);
$this->assertInstanceOf('Gelf\Message', $message);
$this->assertEquals('test', $message->getFile());
$this->assertEquals(14, $message->getLine());
if (self::isGelfVersion1()) {
$this->assertEquals('test', $message->getFile());
$this->assertEquals(14, $message->getLine());
} else {
$this->assertEquals('test', $message->getAdditional('file'));
$this->assertEquals(14, $message->getAdditional('line'));
}
}
/**
@@ -144,7 +154,7 @@ class GelfMessageFormatterTest extends TestCase
'level' => Logger::ERROR,
'level_name' => 'ERROR',
'channel' => 'meh',
'context' => ['from' => 'logger', 'exception' => [
'context' => ['exception' => [
'class' => '\Exception',
'file' => '/some/file/in/dir.php:56',
'trace' => ['/some/file/1.php:23', '/some/file/2.php:3'],
@@ -158,8 +168,12 @@ class GelfMessageFormatterTest extends TestCase
$this->assertInstanceOf('Gelf\Message', $message);
$this->assertEquals("/some/file/in/dir.php", $message->getFile());
$this->assertEquals("56", $message->getLine());
if (self::isGelfVersion1()) {
$this->assertEquals("/some/file/in/dir.php", $message->getFile());
$this->assertEquals("56", $message->getLine());
} else {
$this->assertEquals(['channel' => 'meh', 'ctxt_exception' => '{"class":"\\\\Exception","file":"/some/file/in/dir.php:56","trace":["/some/file/1.php:23","/some/file/2.php:3"]}'], $message->getAllAdditionals());
}
}
/**
@@ -277,4 +291,9 @@ class GelfMessageFormatterTest extends TestCase
{
return interface_exists('\Gelf\IMessagePublisher');
}
private static function isGelfVersion1()
{
return method_exists(Message::class, 'setFacility');
}
}

26
tests/Monolog/Handler/GelfHandlerTest.php
View File

@@ -55,11 +55,16 @@ class GelfHandlerTest extends TestCase
$expectedMessage = new Message();
$expectedMessage
->setLevel(7)
->setFacility("test")
->setShortMessage($record['message'])
->setTimestamp($record['datetime'])
;
if (self::isGelfVersion1()) {
$expectedMessage->setFacility("test");
} else {
$expectedMessage->setAdditional('channel', "test");
}
$messagePublisher = $this->getMessagePublisher();
$messagePublisher->expects($this->once())
->method('publish')
@@ -76,11 +81,16 @@ class GelfHandlerTest extends TestCase
$expectedMessage = new Message();
$expectedMessage
->setLevel(4)
->setFacility("test")
->setShortMessage($record['message'])
->setTimestamp($record['datetime'])
;
if (self::isGelfVersion1()) {
$expectedMessage->setFacility("test");
} else {
$expectedMessage->setAdditional('channel', "test");
}
$messagePublisher = $this->getMessagePublisher();
$messagePublisher->expects($this->once())
->method('publish')
@@ -100,7 +110,6 @@ class GelfHandlerTest extends TestCase
$expectedMessage = new Message();
$expectedMessage
->setLevel(4)
->setFacility("test")
->setHost("mysystem")
->setShortMessage($record['message'])
->setTimestamp($record['datetime'])
@@ -108,6 +117,12 @@ class GelfHandlerTest extends TestCase
->setAdditional("CTXfrom", 'logger')
;
if (self::isGelfVersion1()) {
$expectedMessage->setFacility("test");
} else {
$expectedMessage->setAdditional('channel', "test");
}
$messagePublisher = $this->getMessagePublisher();
$messagePublisher->expects($this->once())
->method('publish')
@@ -117,4 +132,9 @@ class GelfHandlerTest extends TestCase
$handler->setFormatter(new GelfMessageFormatter('mysystem', 'EXT', 'CTX'));
$handler->handle($record);
}
private static function isGelfVersion1()
{
return method_exists(Message::class, 'setFacility');
}
}