jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/387230 )
Change subject: Don't log full request to service in case of delivery error.
......................................................................
Don't log full request to service in case of delivery error.
Bug: T179280
Change-Id: I3a391201654ef2cd27149fefbf315749b07d797c
---
M EventBus.php
1 file changed, 12 insertions(+), 1 deletion(-)
Approvals:
Mobrovac: Looks good to me, approved
jenkins-bot: Verified
diff --git a/EventBus.php b/EventBus.php
index 60273ee..eb0aaf1 100644
--- a/EventBus.php
+++ b/EventBus.php
@@ -101,7 +101,18 @@
// 400: no events are accepted
if ( $res['code'] != 201 ) {
$message = empty( $res['error'] ) ? $res['code'] . ': '
. $res['reason'] : $res['error'];
- $context = [ 'EventBus' => [ 'request' => $req,
'response' => $res ] ];
+ // In case the event posted was too big we don't want
to log all the request body
+ // as it contains all
+ $context = [
+ 'EventBus' => [
+ 'events' => $events,
+ 'response' => $res
+ ]
+ ];
+ // Limit the maximum size of the logged context to 1
megabyte
+ if ( strlen( $body ) > 1048576 ) {
+ $context['EventBus']['events'] = array_column(
$events, 'meta' );
+ }
self::logger()->error( "Unable to deliver all events:
${message}", $context );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/387230
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3a391201654ef2cd27149fefbf315749b07d797c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/EventBus
Gerrit-Branch: master
Gerrit-Owner: Ppchelko <ppche...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Ppchelko <ppche...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
