Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/309179
Change subject: Update queue settings for payments role
......................................................................
Update queue settings for payments role
Add settings for Redis versions of all the new queues, turn on
mirroring for everything that's still in development, switch pending
queue completely over to Redis
Change-Id: I3b7bb633f32c6c23560cceda6188b16b35651583
---
M puppet/modules/payments/manifests/donation_interface.pp
M puppet/modules/smashpig/templates/SmashPig.yaml.erb
2 files changed, 84 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/79/309179/1
diff --git a/puppet/modules/payments/manifests/donation_interface.pp
b/puppet/modules/payments/manifests/donation_interface.pp
index 539c410..2ad74db 100644
--- a/puppet/modules/payments/manifests/donation_interface.pp
+++ b/puppet/modules/payments/manifests/donation_interface.pp
@@ -5,18 +5,19 @@
mediawiki::extension { 'payments:DonationInterface':
settings => {
- wgGlobalCollectGatewayEnabled => true,
- wgAdyenGatewayEnabled => true,
- wgAmazonGatewayEnabled => true,
- wgAstroPayGatewayEnabled => true,
- wgPaypalGatewayEnabled => true,
- wgDonationInterfaceEnableFormChooser => true,
- wgDonationInterfaceEnableQueue => true,
- wgDonationInterfaceEnableSystemStatus => true,
- wgDonationInterfaceEnableFunctionsFilter => true,
- wgDonationInterfaceEnableMinfraud => false,
- wgDonationInterfaceEnableReferrerFilter => true,
- wgDonationInterfaceEnableSourceFilter => true,
+ wgGlobalCollectGatewayEnabled => true,
+ wgAdyenGatewayEnabled => true,
+ wgAmazonGatewayEnabled => true,
+ wgAstroPayGatewayEnabled => true,
+ wgPaypalGatewayEnabled => true,
+ wgDonationInterfaceEnableFormChooser => true,
+ wgDonationInterfaceEnableBannerHistoryLog => true,
+ wgDonationInterfaceEnableQueue => true,
+ wgDonationInterfaceEnableSystemStatus => true,
+ wgDonationInterfaceEnableFunctionsFilter => true,
+ wgDonationInterfaceEnableMinfraud => false,
+ wgDonationInterfaceEnableReferrerFilter => true,
+ wgDonationInterfaceEnableSourceFilter => true,
wgDonationInterfaceTest => true,
@@ -55,8 +56,31 @@
'expiry' => 3600,
'order_key' => 'date',
},
- 'pending-new' => {
- 'queue' => 'pending',
+ 'pending' => {
+ 'type' => 'PHPQueue\Backend\Predis',
+ 'servers' => 'tcp://localhost',
+ 'expiry' => 3600,
+ },
+ 'complete-new' => {
+ 'queue' => 'donations',
+ 'type' => 'PHPQueue\Backend\Predis',
+ 'servers' => 'tcp://localhost',
+ 'expiry' => 3600,
+ },
+ 'banner-history-new' => {
+ 'queue' => 'banner-history',
+ 'type' => 'PHPQueue\Backend\Predis',
+ 'servers' => 'tcp://localhost',
+ 'expiry' => 3600,
+ },
+ 'payments-antifraud-new' => {
+ 'queue' => 'payments-antifraud',
+ 'type' => 'PHPQueue\Backend\Predis',
+ 'servers' => 'tcp://localhost',
+ 'expiry' => 3600,
+ },
+ 'payments-init-new' => {
+ 'queue' => 'payments-init',
'type' => 'PHPQueue\Backend\Predis',
'servers' => 'tcp://localhost',
'expiry' => 3600,
@@ -64,8 +88,11 @@
},
wgDonationInterfaceQueueMirrors => {
- 'globalcollect-cc-limbo' => 'pending-new',
- 'pending' => 'pending-new',
+ 'globalcollect-cc-limbo' => 'pending',
+ 'complete' => 'complete-new',
+ 'banner-history' => 'banner-history-new',
+ 'payments-antifraud' => 'payments-antifraud-new',
+ 'payments-init' => 'payments-init-new',
},
wgDonationInterfaceOrphanCron => {
diff --git a/puppet/modules/smashpig/templates/SmashPig.yaml.erb
b/puppet/modules/smashpig/templates/SmashPig.yaml.erb
index b8928a4..d6787c5 100644
--- a/puppet/modules/smashpig/templates/SmashPig.yaml.erb
+++ b/puppet/modules/smashpig/templates/SmashPig.yaml.erb
@@ -1,11 +1,51 @@
default:
data-store:
- pending-db:
+ # FIXME some way to reuse this between config files
+ redis: &REDIS
+ servers:
+ scheme: tcp
+ host: 127.0.0.1
+ port: 6379
+
+ mysql: &MYSQL
+ class: PDO
inst-args:
- mysql:host=127.0.0.1;dbname=smashpig
- root
- "<%= scope.lookupvar('mysql::root_password') %>"
+ pending-db:
+ <<: *MYSQL
+
+ damaged-db:
+ <<: *MYSQL
+
+ banner-history:
+ class: PHPQueue\Backend\Predis
+ inst-args:
+ -
+ <<: *REDIS
+ queue: 'banner-history'
+
+ antifraud:
+ inst-args:
+ -
+ - antifraud-stomp
+ - payments-antifraud
+
+ verified:
+ inst-args:
+ -
+ - verified-stomp
+ - payments-antifraud
+
+ payments-init:
+ class: PHPQueue\Backend\Predis
+ inst-args:
+ -
+ <<: *REDIS
+ queue: payments-init
+
adyen:
payment-provider:
adyen:
--
To view, visit https://gerrit.wikimedia.org/r/309179
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b7bb633f32c6c23560cceda6188b16b35651583
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
