Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/314434
Change subject: Update smashpig
......................................................................
Update smashpig
Change-Id: If09807d00ecded35cbc909632c832a038e923305
---
M composer/LICENSE
M composer/installed.json
M wikimedia/smash-pig/Core/QueueConsumers/BaseQueueConsumer.php
M wikimedia/smash-pig/PaymentProviders/PayPal/Job.php
M wikimedia/smash-pig/SmashPig.yaml
5 files changed, 25 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/vendor
refs/changes/34/314434/1
diff --git a/composer/LICENSE b/composer/LICENSE
index b0794ff..1a28124 100644
--- a/composer/LICENSE
+++ b/composer/LICENSE
@@ -1,3 +1,4 @@
+
Copyright (c) 2016 Nils Adermann, Jordi Boggiano
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -17,3 +18,4 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
+
diff --git a/composer/installed.json b/composer/installed.json
index eb34158..822915b 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1223,7 +1223,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git";,
- "reference": "172fc5b410a5f0437a535b138a50dfff00c23c31"
+ "reference": "259774101128fae2a8b34deb04d1afa4708db502"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -1240,7 +1240,7 @@
"jakub-onderka/php-parallel-lint": "^0.9",
"phpunit/phpunit": "^4.8"
},
- "time": "2016-10-03 16:32:27",
+ "time": "2016-10-05 19:32:29",
"type": "library",
"installation-source": "source",
"autoload": {
diff --git a/wikimedia/smash-pig/Core/QueueConsumers/BaseQueueConsumer.php
b/wikimedia/smash-pig/Core/QueueConsumers/BaseQueueConsumer.php
index f13a588..b3e5f26 100644
--- a/wikimedia/smash-pig/Core/QueueConsumers/BaseQueueConsumer.php
+++ b/wikimedia/smash-pig/Core/QueueConsumers/BaseQueueConsumer.php
@@ -137,11 +137,19 @@
protected function sendToDamagedStore(
$message, Exception $ex, $retryDate = null
) {
- Logger::error(
- 'Error processing message, moving to damaged store.',
- $message,
- $ex
- );
+ if ( $retryDate ) {
+ Logger::notice(
+ 'Message not fully baked. Sticking it back in
the oven, to ' .
+ "retry at $retryDate",
+ $message
+ );
+ } else {
+ Logger::error(
+ 'Error processing message, moving to damaged
store.',
+ $message,
+ $ex
+ );
+ }
return $this->damagedDb->storeMessage(
$message,
$this->queueName,
diff --git a/wikimedia/smash-pig/PaymentProviders/PayPal/Job.php
b/wikimedia/smash-pig/PaymentProviders/PayPal/Job.php
index 8f5d6b6..79b7888 100644
--- a/wikimedia/smash-pig/PaymentProviders/PayPal/Job.php
+++ b/wikimedia/smash-pig/PaymentProviders/PayPal/Job.php
@@ -92,8 +92,13 @@
$new_msg->gateway = 'paypal';
- // Save to appropriate queue.
SourceFields::addToMessage( $new_msg );
+
+ // FIXME once all messages can be arrays, just make this an
array
+ // at the top
+ $new_msg = (array)$new_msg;
+
+ // Save to appropriate queue.
$this->config->object( 'data-store/' . $msg_type )
->push( $new_msg );
diff --git a/wikimedia/smash-pig/SmashPig.yaml
b/wikimedia/smash-pig/SmashPig.yaml
index eb8622b..df866a3 100644
--- a/wikimedia/smash-pig/SmashPig.yaml
+++ b/wikimedia/smash-pig/SmashPig.yaml
@@ -104,10 +104,10 @@
queue: jobs-paypal
verified:
- class: SmashPig\Core\DataStores\MultiQueueWriter
+ class: PHPQueue\Backend\Predis
constructor-parameters:
-
- - verified-stomp
+ <<: *REDIS
verified-stomp:
class: SmashPig\Core\DataStores\StompDataStore
--
To view, visit https://gerrit.wikimedia.org/r/314434
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If09807d00ecded35cbc909632c832a038e923305
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/vendor
Gerrit-Branch: master
Gerrit-Owner: Ejegg <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
