Procházet zdrojové kódy

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

Jordi Boggiano před 6 roky
rodič
revize
c5a5461624
1 změnil soubory, kde provedl 7 přidání a 8 odebrání
  1. 7 8
      src/Monolog/Handler/SyslogUdpHandler.php

+ 7 - 8
src/Monolog/Handler/SyslogUdpHandler.php

@@ -11,6 +11,7 @@
 
 namespace Monolog\Handler;
 
+use DateTimeInterface;
 use Monolog\Logger;
 use Monolog\Handler\SyslogUdp\UdpSocket;
 
@@ -57,7 +58,7 @@ class SyslogUdpHandler extends AbstractSyslogHandler
     {
         $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) {
             $this->socket->write($line, $header);
@@ -81,7 +82,7 @@ class SyslogUdpHandler extends AbstractSyslogHandler
     /**
      * 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;
 
@@ -93,7 +94,10 @@ class SyslogUdpHandler extends AbstractSyslogHandler
             $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) {
             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
      */