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

Merge pull request #943 from ont/1.x

Browse Source 
Complete rfc5424 header for SyslogUdpHandler
This commit is contained in:
Jordi Boggiano
2017-03-17 22:57:35 +01:00
committed by GitHub
parent 1e044bc4b3 24894709d1
commit e481c9db10
2 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,7 @@ use Monolog\Handler\SyslogUdp\UdpSocket;
class SyslogUdpHandler extends AbstractSyslogHandler class SyslogUdpHandler extends AbstractSyslogHandler
{ {
protected $socket; protected $socket;
protected $ident;
/** /**
* @param string $host * @param string $host
@@ -29,11 +30,14 @@ class SyslogUdpHandler extends AbstractSyslogHandler
* @param mixed $facility * @param mixed $facility
* @param int $level The minimum logging level at which this handler will be triggered * @param int $level The minimum logging level at which this handler will be triggered
* @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not * @param Boolean $bubble Whether the messages that are handled can bubble up the stack or not
* @param string $ident Program name or tag for each log message.
*/ */
public function __construct($host, $port = 514, $facility = LOG_USER, $level = Logger::DEBUG, $bubble = true) public function __construct($host, $port = 514, $facility = LOG_USER, $level = Logger::DEBUG, $bubble = true, $ident = 'php')
{ {
parent::__construct($facility, $level, $bubble); parent::__construct($facility, $level, $bubble);
$this->ident = $ident;
$this->socket = new UdpSocket($host, $port ?: 514); $this->socket = new UdpSocket($host, $port ?: 514);
} }
@@ -69,7 +73,24 @@ class SyslogUdpHandler extends AbstractSyslogHandler
{ {
$priority = $severity + $this->facility; $priority = $severity + $this->facility;
return "<$priority>1 "; if (!$pid = getmypid()) {
$pid = '-';
}
if (!$hostname = gethostname()) {
$hostname = '-';
}
return "<$priority>1 " .
$this->getDateTime() . " " .
$hostname . " " .
$this->ident . " " .
$pid . " - - ";
}
protected function getDateTime()
{
return date(\DateTime::RFC3339);
} }
/** /**

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

@@ -28,16 +28,27 @@ class SyslogUdpHandlerTest extends TestCase
public function testWeSplitIntoLines() public function testWeSplitIntoLines()
{ {
$handler = new SyslogUdpHandler("127.0.0.1", 514, "authpriv"); $time = '2014-01-07T12:34';
$pid = getmypid();
$host = gethostname();
$handler = $this->getMockBuilder('\Monolog\Handler\SyslogUdpHandler')
->setConstructorArgs(array("127.0.0.1", 514, "authpriv"))
->setMethods(array('getDateTime'))
->getMock();
$handler->method('getDateTime')
->willReturn($time);
$handler->setFormatter(new \Monolog\Formatter\ChromePHPFormatter()); $handler->setFormatter(new \Monolog\Formatter\ChromePHPFormatter());
$socket = $this->getMock('\Monolog\Handler\SyslogUdp\UdpSocket', array('write'), array('lol', 'lol')); $socket = $this->getMock('\Monolog\Handler\SyslogUdp\UdpSocket', array('write'), array('lol', 'lol'));
$socket->expects($this->at(0)) $socket->expects($this->at(0))
->method('write') ->method('write')
->with("lol", "<".(LOG_AUTHPRIV + LOG_WARNING).">1 "); ->with("lol", "<".(LOG_AUTHPRIV + LOG_WARNING).">1 $time $host php $pid - - ");
$socket->expects($this->at(1)) $socket->expects($this->at(1))
->method('write') ->method('write')
->with("hej", "<".(LOG_AUTHPRIV + LOG_WARNING).">1 "); ->with("hej", "<".(LOG_AUTHPRIV + LOG_WARNING).">1 $time $host php $pid - - ");
$handler->setSocket($socket); $handler->setSocket($socket);