Gergő Tisza has uploaded a new change for review.

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

Change subject: Warn when a log context accidentally overrides 'message'
......................................................................

Warn when a log context accidentally overrides 'message'

Bug: T145133
Change-Id: I6677dbf608aac1d7fd6036f5e51977d56ce2fc57
---
M includes/debug/logger/monolog/WikiProcessor.php
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/32/313932/1

diff --git a/includes/debug/logger/monolog/WikiProcessor.php 
b/includes/debug/logger/monolog/WikiProcessor.php
index ad939a0..c41f9e2 100644
--- a/includes/debug/logger/monolog/WikiProcessor.php
+++ b/includes/debug/logger/monolog/WikiProcessor.php
@@ -36,6 +36,14 @@
         */
        public function __invoke( array $record ) {
                global $wgVersion;
+
+               if ( isset( $record['context']['message'] ) ) {
+                       // some log aggregators such as Logstash will merge the 
log context into the main
+                       // metadata (where 'message' is the log message) and 
end up overwriting the message
+                       wfLogWarning( __METHOD__ . ": 'message' key overwritten 
in log context. Message was: "
+                               . $record['message'] );
+               }
+
                $record['extra'] = array_merge(
                        $record['extra'],
                        [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6677dbf608aac1d7fd6036f5e51977d56ce2fc57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org>

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

Reply via email to