From 04094e5d99353806b88bf415071b7fc43303df2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Michael=20O=2E=20Hegg=C3=B8?= Date: Wed, 10 Dec 2014 22:51:35 +0100 Subject: [PATCH] SyslogUdpHandler: Send a valid rfc5424 version https://tools.ietf.org/html/rfc5424#section-6.2.2 --- src/Monolog/Handler/SyslogUdpHandler.php | 4 ++-- tests/Monolog/Handler/SyslogUdpHandlerTest.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Monolog/Handler/SyslogUdpHandler.php b/src/Monolog/Handler/SyslogUdpHandler.php index 4aadffc5..aa047c07 100644 --- a/src/Monolog/Handler/SyslogUdpHandler.php +++ b/src/Monolog/Handler/SyslogUdpHandler.php @@ -63,11 +63,11 @@ class SyslogUdpHandler extends AbstractSyslogHandler /** * Make common syslog header (see rfc5424) */ - private function makeCommonSyslogHeader($severity) + protected function makeCommonSyslogHeader($severity) { $priority = $severity + $this->facility; - return "<$priority>: "; + return "<$priority>1 "; } /** diff --git a/tests/Monolog/Handler/SyslogUdpHandlerTest.php b/tests/Monolog/Handler/SyslogUdpHandlerTest.php index 8bd46b3a..497812b3 100644 --- a/tests/Monolog/Handler/SyslogUdpHandlerTest.php +++ b/tests/Monolog/Handler/SyslogUdpHandlerTest.php @@ -32,10 +32,10 @@ class SyslogUdpHandlerTest extends \PHPUnit_Framework_TestCase $socket = $this->getMock('\Monolog\Handler\SyslogUdp\UdpSocket', array('write'), array('lol', 'lol')); $socket->expects($this->at(0)) ->method('write') - ->with("lol", "<".(LOG_AUTHPRIV + LOG_WARNING).">: "); + ->with("lol", "<".(LOG_AUTHPRIV + LOG_WARNING).">1 "); $socket->expects($this->at(1)) ->method('write') - ->with("hej", "<".(LOG_AUTHPRIV + LOG_WARNING).">: "); + ->with("hej", "<".(LOG_AUTHPRIV + LOG_WARNING).">1 "); $handler->setSocket($socket);