jenkins-bot has submitted this change and it was merged.
Change subject: closeOrderReference errors don't blow up
......................................................................
closeOrderReference errors don't blow up
It's nice to clean up the console, but they'll close themselves
after a month anyway. Don't drop the capture and send failmail when
something goes wrong here.
Bug: T150770
Change-Id: I91aee83c560dbe2ba419d626580838bf092f0d56
---
M PaymentProviders/Amazon/Actions/CloseOrderReference.php
1 file changed, 21 insertions(+), 7 deletions(-)
Approvals:
XenoRyet: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PaymentProviders/Amazon/Actions/CloseOrderReference.php
b/PaymentProviders/Amazon/Actions/CloseOrderReference.php
index 3a1f1bb..13bf1ad 100644
--- a/PaymentProviders/Amazon/Actions/CloseOrderReference.php
+++ b/PaymentProviders/Amazon/Actions/CloseOrderReference.php
@@ -1,5 +1,6 @@
<?php namespace SmashPig\PaymentProviders\Amazon\Actions;
+use Exception;
use SmashPig\Core\Actions\IListenerMessageAction;
use SmashPig\Core\Context;
use SmashPig\Core\Logging\Logger;
@@ -20,15 +21,28 @@
$orderReferenceId = $msg->getOrderReferenceId();
Logger::info( "Closing order reference $orderReferenceId" );
- $response = $client->closeOrderReference( array(
- 'amazon_order_reference_id' => $orderReferenceId,
- ) )->toArray();
- if ( !empty( $response['Error'] ) ) {
- Logger::info(
+ // Failure is unexpected, but shouldn't stop us recording
+ // the successful capture
+ try {
+ $response = $client->closeOrderReference(
+ array(
+ 'amazon_order_reference_id' =>
$orderReferenceId,
+ )
+ )->toArray();
+
+ if ( !empty( $response['Error'] ) ) {
+ Logger::warning(
+ "Error closing order reference
$orderReferenceId: " .
+ $response['Error']['Code'] . ': ' .
+ $response['Error']['Message']
+ );
+ return false;
+ }
+ } catch( Exception $ex ) {
+ Logger::warning(
"Error closing order reference
$orderReferenceId: " .
- $response['Error']['Code'] . ': ' .
- $response['Error']['Message']
+ $ex->getMessage()
);
return false;
}
--
To view, visit https://gerrit.wikimedia.org/r/322027
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I91aee83c560dbe2ba419d626580838bf092f0d56
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Cdentinger <cdentin...@wikimedia.org>
Gerrit-Reviewer: XenoRyet <dkozlow...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
