Mwalker has submitted this change and it was merged. Change subject: Revert "Log incoming and normalized Amazon messages" ......................................................................
Revert "Log incoming and normalized Amazon messages" This reverts commit 03015f3827fedea9d0f89c791604ad08ec97ba71. Change-Id: I7fbdaa451166d940bf7a13791b2d2f3005c26380 --- M Core/Logging/LogEvent.php M PaymentProviders/Amazon/AmazonListener.php 2 files changed, 2 insertions(+), 13 deletions(-) Approvals: Mwalker: Looks good to me, approved diff --git a/Core/Logging/LogEvent.php b/Core/Logging/LogEvent.php index cc63225..beb6e44 100644 --- a/Core/Logging/LogEvent.php +++ b/Core/Logging/LogEvent.php @@ -51,7 +51,7 @@ if ( $data instanceof JsonSerializableObject ) { $jdata = $data->toJson(); } else { - $jdata = json_encode( $data, JSON_PRETTY_PRINT ); + $jdata = json_encode( $data ); } if ( $jdata ) { @@ -101,4 +101,4 @@ array_unshift( $stack, $descStr ); return $stack; } -} +} \ No newline at end of file diff --git a/PaymentProviders/Amazon/AmazonListener.php b/PaymentProviders/Amazon/AmazonListener.php index 78da844..ab2aa3b 100644 --- a/PaymentProviders/Amazon/AmazonListener.php +++ b/PaymentProviders/Amazon/AmazonListener.php @@ -10,8 +10,6 @@ /** * Dispatches incoming messages accoring to type - * - * @see https://amazonpayments.s3.amazonaws.com/FPS_ASP_Guides/ASP_Advanced_Users_Guide.pdf */ class AmazonListener extends RestListener { protected $byTypes = array( @@ -37,10 +35,6 @@ protected function parseEnvelope( Request $request ) { $requestValues = $request->getValues(); - - $secureLog = Logger::getTaggedLogger( 'RawData' ); - $secureLog->info( "Incoming message (raw)", $requestValues ); - $messages = array(); if ( array_key_exists( 'notificationType', $requestValues ) ) { $type = $requestValues['notificationType']; @@ -48,8 +42,6 @@ $klass = $this->byType[$type]; $message = new $klass(); $message->constructFromValues($requestValues); - - $secureLog->debug( "Processed message (normalized)", $message ); $messages[] = $message; } else { @@ -61,9 +53,6 @@ $klass = $this->byStatus[$status]; $message = new $klass(); $message->constructFromValues($requestValues); - - $secureLog->debug( "Processed message (normalized)", $message ); - $messages[] = $message; } else { Logger::info( "Message ignored: status = {$status}" ); -- To view, visit https://gerrit.wikimedia.org/r/135981 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7fbdaa451166d940bf7a13791b2d2f3005c26380 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/SmashPig Gerrit-Branch: master Gerrit-Owner: Awight <awi...@wikimedia.org> Gerrit-Reviewer: Mwalker <mwal...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits