From 89ba162dca13c6981346eb1985049cbf4d7c439b Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 20 Nov 2013 13:30:00 +0100 Subject: [PATCH] Update readme, fix cs --- README.mdown | 1 + src/Monolog/Formatter/ElasticaFormatter.php | 4 +++- src/Monolog/Formatter/ScalarFormatter.php | 2 +- src/Monolog/Handler/DynamoDbHandler.php | 8 ++++---- src/Monolog/Handler/ElasticSearchHandler.php | 10 +++++----- src/Monolog/Handler/StreamHandler.php | 3 ++- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/README.mdown b/README.mdown index 64b4cfe3..93994d97 100644 --- a/README.mdown +++ b/README.mdown @@ -196,6 +196,7 @@ Processors - _MemoryPeakUsageProcessor_: Adds the peak memory usage to a log record. - _ProcessIdProcessor_: Adds the process id to a log record. - _UidProcessor_: Adds a unique identifier to a log record. +- _GitProcessor_: Adds the current git branch and commit to a log record. Utilities --------- diff --git a/src/Monolog/Formatter/ElasticaFormatter.php b/src/Monolog/Formatter/ElasticaFormatter.php index f460abe4..b0b0cf06 100644 --- a/src/Monolog/Formatter/ElasticaFormatter.php +++ b/src/Monolog/Formatter/ElasticaFormatter.php @@ -47,6 +47,7 @@ class ElasticaFormatter extends NormalizerFormatter public function format(array $record) { $record = parent::format($record); + return $this->getDocument($record); } @@ -71,7 +72,7 @@ class ElasticaFormatter extends NormalizerFormatter /** * Convert a log message into an Elastica Document * - * @param array $record Log message + * @param array $record Log message * @return Document */ protected function getDocument($record) @@ -80,6 +81,7 @@ class ElasticaFormatter extends NormalizerFormatter $document->setData($record); $document->setType($this->type); $document->setIndex($this->index); + return $document; } } diff --git a/src/Monolog/Formatter/ScalarFormatter.php b/src/Monolog/Formatter/ScalarFormatter.php index 60075030..9e4201ab 100644 --- a/src/Monolog/Formatter/ScalarFormatter.php +++ b/src/Monolog/Formatter/ScalarFormatter.php @@ -34,7 +34,7 @@ class ScalarFormatter extends NormalizerFormatter } /** - * @param mixed $value + * @param mixed $value * @return mixed */ protected function normalizeValue($value) diff --git a/src/Monolog/Handler/DynamoDbHandler.php b/src/Monolog/Handler/DynamoDbHandler.php index 9a7aa750..ad6622e1 100644 --- a/src/Monolog/Handler/DynamoDbHandler.php +++ b/src/Monolog/Handler/DynamoDbHandler.php @@ -39,9 +39,9 @@ class DynamoDbHandler extends AbstractProcessingHandler /** * @param DynamoDbClient $client - * @param string $table - * @param integer $level - * @param boolean $bubble + * @param string $table + * @param integer $level + * @param boolean $bubble */ public function __construct(DynamoDbClient $client, $table, $level = Logger::DEBUG, $bubble = true) { @@ -70,7 +70,7 @@ class DynamoDbHandler extends AbstractProcessingHandler } /** - * @param array $record + * @param array $record * @return array */ protected function filterEmptyFields(array $record) diff --git a/src/Monolog/Handler/ElasticSearchHandler.php b/src/Monolog/Handler/ElasticSearchHandler.php index 1508e77d..96e5d57f 100644 --- a/src/Monolog/Handler/ElasticSearchHandler.php +++ b/src/Monolog/Handler/ElasticSearchHandler.php @@ -46,10 +46,10 @@ class ElasticSearchHandler extends AbstractProcessingHandler protected $options = array(); /** - * @param Client $client Elastica Client object - * @param array $options Handler configuration - * @param integer $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 Client $client Elastica Client object + * @param array $options Handler configuration + * @param integer $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 */ public function __construct(Client $client, array $options = array(), $level = Logger::DEBUG, $bubble = true) { @@ -112,7 +112,7 @@ class ElasticSearchHandler extends AbstractProcessingHandler /** * Use Elasticsearch bulk API to send list of documents - * @param array $documents + * @param array $documents * @throws \RuntimeException */ protected function bulkSend(array $documents) diff --git a/src/Monolog/Handler/StreamHandler.php b/src/Monolog/Handler/StreamHandler.php index 521b5751..28175294 100644 --- a/src/Monolog/Handler/StreamHandler.php +++ b/src/Monolog/Handler/StreamHandler.php @@ -73,7 +73,8 @@ class StreamHandler extends AbstractProcessingHandler fwrite($this->stream, (string) $record['formatted']); } - private function customErrorHandler($code, $msg) { + private function customErrorHandler($code, $msg) + { $this->errorMessage = preg_replace('{^fopen\(.*?\): }', '', $msg); } }