mirror of
https://github.com/Seldaek/monolog.git
synced 2025-07-30 18:00:17 +02:00
CS fixes
This commit is contained in:
@@ -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
|
||||
----------
|
||||
|
@@ -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'];
|
||||
}
|
||||
|
@@ -67,6 +67,7 @@ class BufferHandler extends AbstractHandler
|
||||
|
||||
$this->buffer[] = $record;
|
||||
$this->bufferSize++;
|
||||
|
||||
return false === $this->bubble;
|
||||
}
|
||||
|
||||
|
@@ -14,7 +14,6 @@ namespace Monolog\Handler;
|
||||
use Monolog\Logger;
|
||||
use Monolog\Formatter\LineFormatter;
|
||||
|
||||
|
||||
/**
|
||||
* Logs to syslog service.
|
||||
*
|
||||
|
@@ -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);
|
||||
|
@@ -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;
|
||||
}))
|
||||
;
|
||||
|
@@ -23,4 +23,3 @@ class MockMessagePublisher extends MessagePublisher
|
||||
|
||||
public $lastMessage = null;
|
||||
}
|
||||
|
||||
|
@@ -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');
|
||||
|
Reference in New Issue
Block a user