diff --git a/README.mdown b/README.mdown index f7ea73e7..7c22378b 100644 --- a/README.mdown +++ b/README.mdown @@ -147,7 +147,7 @@ Formatters - _WildfireFormatter_: Used to format log records into the Wildfire/FirePHP protocol, only useful for the FirePHPHandler. - _ChromePHPFormatter_: Used to format log records into the ChromePHP format, only useful for the ChromePHPHandler. - _GelfFormatter_: Used to format log records into Gelf message instances, only useful for the GelfHandler. -- _LogstashEventFormatter_: Used to format log records into [logstash](http://logstash.net/) event json, useful for any handler listed under inputs [here](http://logstash.net/docs/1.1.1/). +- _LogstashFormatter_: Used to format log records into [logstash](http://logstash.net/) event json, useful for any handler listed under inputs [here](http://logstash.net/docs/1.1.5/). Processors ---------- diff --git a/src/Monolog/Formatter/LogstashFormatter.php b/src/Monolog/Formatter/LogstashFormatter.php index d9772033..7cf34bda 100644 --- a/src/Monolog/Formatter/LogstashFormatter.php +++ b/src/Monolog/Formatter/LogstashFormatter.php @@ -11,10 +11,9 @@ namespace Monolog\Formatter; -use Monolog\Logger; - /** * Serializes a log message to Logstash Event Format + * * @see http://logstash.net/ * @see https://github.com/logstash/logstash/blob/master/lib/logstash/event.rb * @@ -66,14 +65,15 @@ class LogstashFormatter extends NormalizerFormatter '@message' => $record['message'], '@tags' => array($record['channel']), '@source' => $this->systemName - ); + ); - if (isset($this->applicationName)) { - $message['@type'] = $this->applicationName; + if ($this->applicationName) { + $message['@type'] = $this->applicationName; } $message['@fields'] = array(); $message['@fields']['channel'] = $record['channel']; $message['@fields']['level'] = $record['level']; + if (isset($record['extra']['server'])) { $message['@source_host'] = $record['extra']['server']; } diff --git a/src/Monolog/Handler/BufferHandler.php b/src/Monolog/Handler/BufferHandler.php index 133524ff..0ae96625 100644 --- a/src/Monolog/Handler/BufferHandler.php +++ b/src/Monolog/Handler/BufferHandler.php @@ -67,6 +67,7 @@ class BufferHandler extends AbstractHandler $this->buffer[] = $record; $this->bufferSize++; + return false === $this->bubble; } diff --git a/src/Monolog/Handler/SyslogHandler.php b/src/Monolog/Handler/SyslogHandler.php index 023b8811..6d6504d6 100644 --- a/src/Monolog/Handler/SyslogHandler.php +++ b/src/Monolog/Handler/SyslogHandler.php @@ -14,7 +14,6 @@ namespace Monolog\Handler; use Monolog\Logger; use Monolog\Formatter\LineFormatter; - /** * Logs to syslog service. * diff --git a/tests/Monolog/Formatter/LogstashFormatterTest.php b/tests/Monolog/Formatter/LogstashFormatterTest.php index f94df6f6..2417e95e 100644 --- a/tests/Monolog/Formatter/LogstashFormatterTest.php +++ b/tests/Monolog/Formatter/LogstashFormatterTest.php @@ -89,7 +89,6 @@ class LogstashFormatterTest extends \PHPUnit_Framework_TestCase $message = json_decode($formatter->format($record), true); - $message_array = $message['@fields']; $this->assertArrayHasKey('ctxt_from', $message_array); @@ -99,7 +98,6 @@ class LogstashFormatterTest extends \PHPUnit_Framework_TestCase $formatter = new LogstashFormatter('test', null, null, 'CTX'); $message = json_decode($formatter->format($record), true); - $message_array = $message['@fields']; $this->assertArrayHasKey('CTXfrom', $message_array); diff --git a/tests/Monolog/Handler/AbstractProcessingHandlerTest.php b/tests/Monolog/Handler/AbstractProcessingHandlerTest.php index d36132fa..3485bdf3 100644 --- a/tests/Monolog/Handler/AbstractProcessingHandlerTest.php +++ b/tests/Monolog/Handler/AbstractProcessingHandlerTest.php @@ -69,7 +69,7 @@ class AbstractProcessingHandlerTest extends TestCase $handledRecord = null; $handler->expects($this->once()) ->method('write') - ->will($this->returnCallback(function($record) use (&$handledRecord){ + ->will($this->returnCallback(function($record) use (&$handledRecord) { $handledRecord = $record; })) ; diff --git a/tests/Monolog/Handler/GelfMocks.php b/tests/Monolog/Handler/GelfMocks.php index 18515f96..dda87114 100644 --- a/tests/Monolog/Handler/GelfMocks.php +++ b/tests/Monolog/Handler/GelfMocks.php @@ -23,4 +23,3 @@ class MockMessagePublisher extends MessagePublisher public $lastMessage = null; } - diff --git a/tests/Monolog/LoggerTest.php b/tests/Monolog/LoggerTest.php index 86e267ad..fafe951f 100644 --- a/tests/Monolog/LoggerTest.php +++ b/tests/Monolog/LoggerTest.php @@ -196,7 +196,7 @@ class LoggerTest extends \PHPUnit_Framework_TestCase ; $logger->pushHandler($handler); $that = $this; - $logger->pushProcessor(function($record) use ($that){ + $logger->pushProcessor(function($record) use ($that) { $that->fail('The processor should not be called'); }); $logger->addAlert('test');