Mwalker has uploaded a new change for review.

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


Change subject: Cleanup Adyen
......................................................................

Cleanup Adyen

Adding moar logs!

Change-Id: I38fbb6443cced6f56adb5297f20bfbad2e09019a
---
M SmashPig/PaymentProviders/Adyen/Actions/PaymentCaptureAction.php
M SmashPig/PaymentProviders/Adyen/AdyenListener.php
M SmashPig/PaymentProviders/Adyen/Jobs/ProcessCaptureRequestJob.php
3 files changed, 21 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/PaymentsListeners 
refs/changes/58/63158/1

diff --git a/SmashPig/PaymentProviders/Adyen/Actions/PaymentCaptureAction.php 
b/SmashPig/PaymentProviders/Adyen/Actions/PaymentCaptureAction.php
index f9a642a..03e812e 100644
--- a/SmashPig/PaymentProviders/Adyen/Actions/PaymentCaptureAction.php
+++ b/SmashPig/PaymentProviders/Adyen/Actions/PaymentCaptureAction.php
@@ -27,6 +27,8 @@
        }
 
        public function execute( ListenerMessage $msg ) {
+               Logger::enterContext( 'PaymentCaptureAction' );
+
                if ( $msg instanceof Authorisation ) {
                        if ( $msg->success ) {
                                // Here we need to capture the payment, the job 
runner will collect the
@@ -59,6 +61,7 @@
                        }
                }
 
+               Logger::leaveContext();
                return true;
        }
 }
diff --git a/SmashPig/PaymentProviders/Adyen/AdyenListener.php 
b/SmashPig/PaymentProviders/Adyen/AdyenListener.php
index 575788c..3c02dc7 100644
--- a/SmashPig/PaymentProviders/Adyen/AdyenListener.php
+++ b/SmashPig/PaymentProviders/Adyen/AdyenListener.php
@@ -88,6 +88,9 @@
                                }
                        }
 
+                       $numItems = count( $messages );
+                       Logger::info( "Extracted $numItems from received 
message. Beginning processing loop." );
+
                        // Now process each message to the best of our ability
                        foreach ( $messages as $msg ) {
                                if ( $this->processMessage( $msg ) ) {
@@ -98,6 +101,7 @@
                                }
                        }
 
+                       Logger::info( 'Finished processing of IPN message, 
retuning accepted.');
                        $respstring = '[accepted]';
 
                } else {
@@ -119,7 +123,8 @@
                        Logger::error( 'Listener message object could not be 
created. Unknown type!', $item );
                        return false;
                } else {
-                       Logger::info( 'Listener message created - adding to 
pending store.' );
+                       $className = get_class( $msg );
+                       Logger::info( "Listener message of type $className 
created - adding to pending store." );
                        $this->pendingStore->addObject( $msg );
                }
                return $msg;
diff --git a/SmashPig/PaymentProviders/Adyen/Jobs/ProcessCaptureRequestJob.php 
b/SmashPig/PaymentProviders/Adyen/Jobs/ProcessCaptureRequestJob.php
index 540c7f1..ffdb13c 100644
--- a/SmashPig/PaymentProviders/Adyen/Jobs/ProcessCaptureRequestJob.php
+++ b/SmashPig/PaymentProviders/Adyen/Jobs/ProcessCaptureRequestJob.php
@@ -7,6 +7,16 @@
 use SmashPig\CrmLink\Messages\LimboMessage;
 use SmashPig\CrmLink\Messages\PaymentSuccess;
 
+/**
+ * Job that merges inbound IPN calls from Adyen with a limbo message in the 
queue
+ * and then places that into the verified queue. Is idempotent with respect to 
the
+ * limbo queue state -- e.g. if no limbo message is found it assumes that the 
message
+ * was already processed.
+ *
+ * Class ProcessCaptureRequestJob
+ *
+ * @package SmashPig\PaymentProviders\Adyen\Jobs
+ */
 class ProcessCaptureRequestJob extends RunnableJob {
 
        protected $account;
@@ -27,6 +37,7 @@
        }
 
        public function execute() {
+               Logger::enterContext( "corr_id-$this->correlationId" );
                Logger::info(
                        "Attempting to capture payment on account 
'{$this->account}' with reference '{$this->pspReference}' and correlation id 
'{$this->correlationId}'."
                );
@@ -73,6 +84,7 @@
                        );
                }
 
+               Logger::leaveContext();
                return true;
        }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38fbb6443cced6f56adb5297f20bfbad2e09019a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/PaymentsListeners
Gerrit-Branch: master
Gerrit-Owner: Mwalker <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to