mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-05 04:37:38 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'Pierre-Lannoy/patch-1'

Browse Source
This commit is contained in:
Jordi Boggiano
2019-08-16 09:42:40 +02:00
parent b78de556de b615b158e4
commit c5a5461624
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Monolog/Handler/SyslogUdpHandler.php
View File

@@ -11,6 +11,7 @@
namespace Monolog\Handler; namespace Monolog\Handler;
use DateTimeInterface;
use Monolog\Logger; use Monolog\Logger;
use Monolog\Handler\SyslogUdp\UdpSocket; use Monolog\Handler\SyslogUdp\UdpSocket;
@@ -57,7 +58,7 @@ class SyslogUdpHandler extends AbstractSyslogHandler
{ {
$lines = $this->splitMessageIntoLines($record['formatted']); $lines = $this->splitMessageIntoLines($record['formatted']);
$header = $this->makeCommonSyslogHeader($this->logLevels[$record['level']]); $header = $this->makeCommonSyslogHeader($this->logLevels[$record['level']], $record['datetime']);
foreach ($lines as $line) { foreach ($lines as $line) {
$this->socket->write($line, $header); $this->socket->write($line, $header);
@@ -81,7 +82,7 @@ class SyslogUdpHandler extends AbstractSyslogHandler
/** /**
* Make common syslog header (see rfc5424 or rfc3164) * Make common syslog header (see rfc5424 or rfc3164)
*/ */
protected function makeCommonSyslogHeader(int $severity): string protected function makeCommonSyslogHeader(int $severity, DateTimeInterface $datetime): string
{ {
$priority = $severity + $this->facility; $priority = $severity + $this->facility;
@@ -93,7 +94,10 @@ class SyslogUdpHandler extends AbstractSyslogHandler
$hostname = '-'; $hostname = '-';
} }
$date = $this->getDateTime(); if ($this->rfc === self::RFC3164) {
$datetime->setTimezone(new \DateTimeZone('UTC'));
}
$date = $datetime->format($this->dateFormats[$this->rfc]);
if ($this->rfc === self::RFC3164) { if ($this->rfc === self::RFC3164) {
return "<$priority>" . return "<$priority>" .
@@ -109,11 +113,6 @@ class SyslogUdpHandler extends AbstractSyslogHandler
} }
} }
protected function getDateTime(): string
{
return date($this->dateFormats[$this->rfc]);
}
/** /**
* Inject your own socket, mainly used for testing * Inject your own socket, mainly used for testing
*/ */