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

Make sure SyslogUdpHandler does not create empty frames where not necessary, fixes #841

Browse Source
This commit is contained in:
Jordi Boggiano
2016-09-25 17:30:37 +02:00
parent 9f8d34afae
commit 40b4891030
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,7 +59,7 @@ class SyslogUdpHandler extends AbstractSyslogHandler
$message = implode("\n", $message); $message = implode("\n", $message);
} }
return preg_split('/$\R?^/m', $message); return preg_split('/$\R?^/m', $message, -1, PREG_SPLIT_NO_EMPTY);
} }
/** /**

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

@@ -11,10 +11,12 @@
namespace Monolog\Handler; namespace Monolog\Handler;
use Monolog\TestCase;
/** /**
* @requires extension sockets * @requires extension sockets
*/ */
class SyslogUdpHandlerTest extends \PHPUnit_Framework_TestCase class SyslogUdpHandlerTest extends TestCase
{ {
/** /**
* @expectedException UnexpectedValueException * @expectedException UnexpectedValueException
@@ -42,6 +44,20 @@ class SyslogUdpHandlerTest extends \PHPUnit_Framework_TestCase
$handler->handle($this->getRecordWithMessage("hej\nlol")); $handler->handle($this->getRecordWithMessage("hej\nlol"));
} }
public function testSplitWorksOnEmptyMsg()
{
$handler = new SyslogUdpHandler("127.0.0.1", 514, "authpriv");
$handler->setFormatter($this->getIdentityFormatter());
$socket = $this->getMock('\Monolog\Handler\SyslogUdp\UdpSocket', array('write'), array('lol', 'lol'));
$socket->expects($this->never())
->method('write');
$handler->setSocket($socket);
$handler->handle($this->getRecordWithMessage(null));
}
protected function getRecordWithMessage($msg) protected function getRecordWithMessage($msg)
{ {
return array('message' => $msg, 'level' => \Monolog\Logger::WARNING, 'context' => null, 'extra' => array(), 'channel' => 'lol'); return array('message' => $msg, 'level' => \Monolog\Logger::WARNING, 'context' => null, 'extra' => array(), 'channel' => 'lol');