[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Monolog: Add processor for XFF resolved IP"

2016-11-29 Thread Chad (Code Review) 
Chad has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/324333

Change subject: Revert "Monolog: Add processor for XFF resolved IP"
..

Revert "Monolog: Add processor for XFF resolved IP"

Causes segfault.

This reverts commit 79b0adc5525b249d9d90371a9167aded38dc.

Change-Id: I4d46a15ede6c6471925398f5a2bd716d15b139e5
---
M wmf-config/logging.php
1 file changed, 0 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/33/324333/1

diff --git a/wmf-config/logging.php b/wmf-config/logging.php
index d56c9fa..45a8eb4 100644
--- a/wmf-config/logging.php
+++ b/wmf-config/logging.php
@@ -58,22 +58,6 @@
'psr' => [
'class' => '\\Monolog\\Processor\\PsrLogMessageProcessor',
],
-   'xff-ip' => [
-   'factory' => function () {
-   /**
-* Overwrite the 'ip' key set by WebProcessor with a 
version that
-* honors XFF headers if we can. T114700
-*/
-   return function( array $record ) {
-   try {
-   $record['ip'] = 
RequestContext::getMain()->getRequest()->getIP();
-   } catch ( Exception $ignored ) {
-   // no-op
-   }
-   return $record;
-   };
-   },
-   ],
'web' => [
'class' => '\\Monolog\\Processor\\WebProcessor',
],

-- 
To view, visit https://gerrit.wikimedia.org/r/324333
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d46a15ede6c6471925398f5a2bd716d15b139e5
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Monolog: Add processor for XFF resolved IP"

2016-11-29 Thread Chad (Code Review) 
Chad has submitted this change and it was merged.

Change subject: Revert "Monolog: Add processor for XFF resolved IP"
..


Revert "Monolog: Add processor for XFF resolved IP"

Causes segfault.

This reverts commit 79b0adc5525b249d9d90371a9167aded38dc.

Change-Id: I4d46a15ede6c6471925398f5a2bd716d15b139e5
---
M wmf-config/logging.php
1 file changed, 0 insertions(+), 16 deletions(-)

Approvals:
  Chad: Verified; Looks good to me, approved



diff --git a/wmf-config/logging.php b/wmf-config/logging.php
index d56c9fa..45a8eb4 100644
--- a/wmf-config/logging.php
+++ b/wmf-config/logging.php
@@ -58,22 +58,6 @@
'psr' => [
'class' => '\\Monolog\\Processor\\PsrLogMessageProcessor',
],
-   'xff-ip' => [
-   'factory' => function () {
-   /**
-* Overwrite the 'ip' key set by WebProcessor with a 
version that
-* honors XFF headers if we can. T114700
-*/
-   return function( array $record ) {
-   try {
-   $record['ip'] = 
RequestContext::getMain()->getRequest()->getIP();
-   } catch ( Exception $ignored ) {
-   // no-op
-   }
-   return $record;
-   };
-   },
-   ],
'web' => [
'class' => '\\Monolog\\Processor\\WebProcessor',
],

-- 
To view, visit https://gerrit.wikimedia.org/r/324333
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4d46a15ede6c6471925398f5a2bd716d15b139e5
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits