mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-11 15:44:34 +02:00
Code Issues Releases Wiki Activity

finishing Syslog formatter (#1689)

Browse Source 
* feat: Syslog formatter

* feat: Syslog formatter, app name

* update syslogFormatter

* Remove legacy syntax

Co-authored-by: Dalibor Karlović <dalibor.karlovic@sigwin.hr>
Co-authored-by: Renat Gabdullin <renatobyj@gmail.com>
This commit is contained in:
picass0
2022-07-22 18:17:53 +04:00
committed by GitHub
parent 7684fae8fa
commit a7e5beda57
9 changed files with 214 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
tests/Monolog/Formatter/SyslogFormatterTest.php Normal file
View File

@@ -0,0 +1,113 @@
<?php declare(strict_types=1);
/*
* 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\Formatter;
use DateTimeImmutable;
use Monolog\Level;
use Monolog\LogRecord;
use PHPUnit\Framework\TestCase;
class SyslogFormatterTest extends TestCase
{
/**
* @dataProvider formatDataProvider
*
* @param string $expected
* @param DateTimeImmutable $dateTime
* @param string $channel
* @param Level $level
* @param string $message
* @param string|null $appName
* @param mixed[] $context
* @param mixed[] $extra
* @return void
*/
public function testFormat(
string $expected,
DateTimeImmutable $dateTime,
string $channel,
Level $level,
string $message,
string $appName = null,
array $context = [],
array $extra = []
): void {
if ($appName !== null) {
$formatter = new SyslogFormatter($appName);
} else {
$formatter = new SyslogFormatter();
}
$record = new LogRecord(
datetime: $dateTime,
channel: $channel,
level: $level,
message: $message,
context: $context,
extra: $extra
);
$message = $formatter->format($record);
$this->assertEquals($expected, $message);
}
/**
* @return mixed[]
*/
public function formatDataProvider(): array
{
return [
'error' => [
'expected' => "<11>1 1970-01-01T00:00:00.000000+00:00 " . gethostname() . " - " . getmypid() ." meh - ERROR: log \n",
'dateTime' => new DateTimeImmutable("@0"),
'channel' => 'meh',
'level' => Level::Error,
'message' => 'log',
],
'info' => [
'expected' => "<11>1 1970-01-01T00:00:00.000000+00:00 " . gethostname() . " - " . getmypid() ." meh - ERROR: log \n",
'dateTime' => new DateTimeImmutable("@0"),
'channel' => 'meh',
'level' => Level::Error,
'message' => 'log',
],
'with app name' => [
'expected' => "<11>1 1970-01-01T00:00:00.000000+00:00 " . gethostname() . " my-app " . getmypid() ." meh - ERROR: log \n",
'dateTime' => new DateTimeImmutable("@0"),
'channel' => 'meh',
'level' => Level::Error,
'message' => 'log',
'appName' => 'my-app',
],
'with context' => [
'expected' => "<11>1 1970-01-01T00:00:00.000000+00:00 " . gethostname() . " - " . getmypid() ." meh - ERROR: log {\"additional-context\":\"test\"} \n",
'dateTime' => new DateTimeImmutable("@0"),
'channel' => 'meh',
'level' => Level::Error,
'message' => 'log',
'appName' => null,
'context' => ['additional-context' => 'test'],
],
'with extra' => [
'expected' => "<11>1 1970-01-01T00:00:00.000000+00:00 " . gethostname() . " - " . getmypid() ." meh - ERROR: log {\"userId\":1}\n",
'dateTime' => new DateTimeImmutable("@0"),
'channel' => 'meh',
'level' => Level::Error,
'message' => 'log',
'appName' => null,
'context' => [],
'extra' => ['userId' => 1],
],
];
}
}

6
tests/Monolog/Handler/SyslogUdpHandlerTest.php
View File

@@ -35,7 +35,7 @@ class SyslogUdpHandlerTest extends TestCase
$handler->setFormatter(new \Monolog\Formatter\ChromePHPFormatter());
$time = '2014-01-07T12:34:56+00:00';
$socket = $this->getMockBuilder('Monolog\Handler\SyslogUdp\UdpSocket')
$socket = $this->getMockBuilder('Monolog\Handler\Syslog\SyslogUdp\UdpSocket')
->onlyMethods(['write'])
->setConstructorArgs(['lol'])
->getMock();
@@ -56,7 +56,7 @@ class SyslogUdpHandlerTest extends TestCase
$handler = new SyslogUdpHandler("127.0.0.1", 514, "authpriv");
$handler->setFormatter($this->getIdentityFormatter());
$socket = $this->getMockBuilder('Monolog\Handler\SyslogUdp\UdpSocket')
$socket = $this->getMockBuilder('Monolog\Handler\Syslog\SyslogUdp\UdpSocket')
->onlyMethods(['write'])
->setConstructorArgs(['lol'])
->getMock();
@@ -81,7 +81,7 @@ class SyslogUdpHandlerTest extends TestCase
$handler->setFormatter(new \Monolog\Formatter\ChromePHPFormatter());
$socket = $this->getMockBuilder('\Monolog\Handler\SyslogUdp\UdpSocket')
$socket = $this->getMockBuilder('\Monolog\Handler\Syslog\SyslogUdp\UdpSocket')
->setConstructorArgs(['lol', 999])
->onlyMethods(['write'])
->getMock();

6
tests/Monolog/Handler/UdpSocketTest.php
View File

@@ -12,7 +12,7 @@
namespace Monolog\Handler;
use Monolog\Test\TestCase;
use Monolog\Handler\SyslogUdp\UdpSocket;
use Monolog\Handler\Syslog\SyslogUdp\UdpSocket;
/**
* @requires extension sockets
@@ -21,7 +21,7 @@ class UdpSocketTest extends TestCase
{
public function testWeDoNotTruncateShortMessages()
{
$socket = $this->getMockBuilder('Monolog\Handler\SyslogUdp\UdpSocket')
$socket = $this->getMockBuilder('Monolog\Handler\Syslog\SyslogUdp\UdpSocket')
->onlyMethods(['send'])
->setConstructorArgs(['lol'])
->getMock();
@@ -35,7 +35,7 @@ class UdpSocketTest extends TestCase
public function testLongMessagesAreTruncated()
{
$socket = $this->getMockBuilder('Monolog\Handler\SyslogUdp\UdpSocket')
$socket = $this->getMockBuilder('Monolog\Handler\Syslog\SyslogUdp\UdpSocket')
->onlyMethods(['send'])
->setConstructorArgs(['lol'])
->getMock();