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

WebProcessor: extra fields appended in a loop over declared values, instead of copy-pasting

Browse Source
This commit is contained in:
Dawid Nowak
2014-07-01 20:25:13 +02:00
parent 9da894a8b3
commit 9aba3242f6
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Monolog/Processor/WebProcessor.php
View File

@@ -18,8 +18,22 @@ namespace Monolog\Processor;
*/ */
class WebProcessor class WebProcessor
{ {
/**
* @var array|\ArrayAccess
*/
protected $serverData; protected $serverData;
/**
* @var array
*/
protected $extraFields = array(
'url' => 'REQUEST_URI',
'ip' => 'REMOTE_ADDR',
'http_method' => 'REQUEST_METHOD',
'server' => 'SERVER_NAME',
'referrer' => 'HTTP_REFERER',
);
/** /**
* @param mixed $serverData array or object w/ ArrayAccess that provides access to the $_SERVER data * @param mixed $serverData array or object w/ ArrayAccess that provides access to the $_SERVER data
*/ */
@@ -57,16 +71,9 @@ class WebProcessor
*/ */
private function appendExtraFields(array $extra) private function appendExtraFields(array $extra)
{ {
$extra = array_merge( foreach ($this->extraFields as $extraName => $serverName) {
$extra, $extra[$extraName] = isset($this->serverData[$serverName]) ? $this->serverData[$serverName] : null;
array( }
'url' => $this->serverData['REQUEST_URI'],
'ip' => isset($this->serverData['REMOTE_ADDR']) ? $this->serverData['REMOTE_ADDR'] : null,
'http_method' => isset($this->serverData['REQUEST_METHOD']) ? $this->serverData['REQUEST_METHOD'] : null,
'server' => isset($this->serverData['SERVER_NAME']) ? $this->serverData['SERVER_NAME'] : null,
'referrer' => isset($this->serverData['HTTP_REFERER']) ? $this->serverData['HTTP_REFERER'] : null,
)
);
if (isset($this->serverData['UNIQUE_ID'])) { if (isset($this->serverData['UNIQUE_ID'])) {
$extra['unique_id'] = $this->serverData['UNIQUE_ID']; $extra['unique_id'] = $this->serverData['UNIQUE_ID'];