mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-10-22 09:06:10 +02:00
Code Issues Releases Wiki Activity

Set @timestamp default value and ignore other empty values.

Browse Source
This commit is contained in:
Bruno Pedro
2014-04-08 09:25:42 +02:00
parent c3dd9b972b
commit 3c0c213b41
1 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/Monolog/Formatter/LogstashFormatter.php
View File

@@ -85,14 +85,17 @@ class LogstashFormatter extends NormalizerFormatter
protected function formatV0(array $record) protected function formatV0(array $record)
{ {
if (empty($record['datetime'])) {
$record['datetime'] = gmdate('c');
}
$message = array( $message = array(
'@timestamp' => $record['datetime'], '@timestamp' => $record['datetime'],
'@message' => $record['message'], '@message' => @$record['message'],
'@tags' => array($record['channel']), '@tags' => array(@$record['channel']),
'@source' => $this->systemName, '@source' => $this->systemName,
'@fields' => array( '@fields' => array(
'channel' => $record['channel'], 'channel' => @$record['channel'],
'level' => $record['level'] 'level' => @$record['level']
) )
); );
@@ -106,12 +109,15 @@ class LogstashFormatter extends NormalizerFormatter
if (isset($record['extra']['url'])) { if (isset($record['extra']['url'])) {
$message['@source_path'] = $record['extra']['url']; $message['@source_path'] = $record['extra']['url'];
} }
foreach ($record['extra'] as $key => $val) { if (!empty($record['extra'])) {
$message['@fields'][$this->extraPrefix . $key] = $val; foreach ($record['extra'] as $key => $val) {
$message['@fields'][$this->extraPrefix . $key] = $val;
}
} }
if (!empty($record['context'])) {
foreach ($record['context'] as $key => $val) { foreach ($record['context'] as $key => $val) {
$message['@fields'][$this->contextPrefix . $key] = $val; $message['@fields'][$this->contextPrefix . $key] = $val;
}
} }
return $message; return $message;
@@ -119,26 +125,31 @@ class LogstashFormatter extends NormalizerFormatter
protected function formatV1(array $record) protected function formatV1(array $record)
{ {
if (empty($record['datetime'])) {
$record['datetime'] = gmdate('c');
}
$message = array( $message = array(
'@timestamp' => $record['datetime'], '@timestamp' => $record['datetime'],
'@version' => 1, '@version' => 1,
'message' => $record['message'], 'message' => @$record['message'],
'host' => $this->systemName, 'host' => $this->systemName,
'type' => $record['channel'], 'type' => @$record['channel'],
'channel' => $record['channel'], 'channel' => @$record['channel'],
'level' => $record['level_name'] 'level' => @$record['level_name']
); );
if ($this->applicationName) { if ($this->applicationName) {
$message['type'] = $this->applicationName; $message['type'] = $this->applicationName;
} }
if (!empty($record['extra'])) {
foreach ($record['extra'] as $key => $val) { foreach ($record['extra'] as $key => $val) {
$message[$this->extraPrefix . $key] = $val; $message[$this->extraPrefix . $key] = $val;
}
} }
if (!empty($record['context'])) {
foreach ($record['context'] as $key => $val) { foreach ($record['context'] as $key => $val) {
$message[$this->contextPrefix . $key] = $val; $message[$this->contextPrefix . $key] = $val;
}
} }
return $message; return $message;