jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348109 )
Change subject: Get rid of -new suffix on refund and recurring queues
......................................................................
Get rid of -new suffix on refund and recurring queues
And update SmsahPig lib to match
Bug: T162852
Change-Id: I3c9c2e442ddcc83a0ff6dce09af9d10d1de5e977
---
M composer.lock
M sites/all/modules/globalcollect_audit/globalcollect_audit.module
M sites/all/modules/queue2civicrm/recurring/recurring.module
M sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
M sites/all/modules/wmf_audit/wmf_audit.module
5 files changed, 54 insertions(+), 7 deletions(-)
Approvals:
jenkins-bot: Verified
Awight: Looks good to me, approved
diff --git a/composer.lock b/composer.lock
index ea29207..fddf3e8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -607,6 +607,52 @@
"time": "2016-06-16 16:22:20"
},
{
+ "name": "psr/cache",
+ "version": "1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/cache.git";,
+ "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8";,
+ "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Cache\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/";
+ }
+ ],
+ "description": "Common interface for caching libraries",
+ "keywords": [
+ "cache",
+ "psr",
+ "psr-6"
+ ],
+ "time": "2016-08-06 20:24:11"
+ },
+ {
"name": "psr/log",
"version": "1.0.2",
"source": {
@@ -1104,7 +1150,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git";,
- "reference": "e93f367df07254a5168b0636e62c793144f7f446"
+ "reference": "b9333c5955a9d69162f95357eb2d6c149c9ba884"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
@@ -1112,6 +1158,7 @@
"php": ">=5.3.3",
"phpmailer/phpmailer": "^5.2",
"predis/predis": "^1.1",
+ "psr/cache": "^1.0",
"symfony/event-dispatcher": "^2.1",
"symfony/http-foundation": "^2.1",
"symfony/yaml": "^2.8"
@@ -1154,7 +1201,7 @@
"donations",
"payments"
],
- "time": "2017-01-20 00:46:22"
+ "time": "2017-04-13 00:32:33"
},
{
"name": "zordius/lightncandy",
diff --git a/sites/all/modules/globalcollect_audit/globalcollect_audit.module
b/sites/all/modules/globalcollect_audit/globalcollect_audit.module
index 34eab3a..d0bdcde 100644
--- a/sites/all/modules/globalcollect_audit/globalcollect_audit.module
+++ b/sites/all/modules/globalcollect_audit/globalcollect_audit.module
@@ -1997,7 +1997,7 @@
if ( $queueId === 'donations' ) {
$configKey = 'data-store/donations';
} elseif ( $queueId === 'refund' ) {
- $configKey = 'data-store/refund-new';
+ $configKey = 'data-store/refund';
} else {
throw new Exception( "What kind of a queue is this??: {$queueId}" );
}
diff --git a/sites/all/modules/queue2civicrm/recurring/recurring.module
b/sites/all/modules/queue2civicrm/recurring/recurring.module
index 37419d3..19f062c 100644
--- a/sites/all/modules/queue2civicrm/recurring/recurring.module
+++ b/sites/all/modules/queue2civicrm/recurring/recurring.module
@@ -91,7 +91,7 @@
}
$consumer = new RecurringQueueConsumer(
- 'recurring-new', // TODO: kill all the -new suffixes
+ 'recurring',
variable_get( 'recurring_batch_time', 0 ),
variable_get( 'recurring_batch', 0 )
);
diff --git a/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
b/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
index 368d423..a61ce62 100644
--- a/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
+++ b/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
@@ -92,7 +92,7 @@
watchdog('refund', 'Executing: refund_batch_process');
$consumer = new RefundQueueConsumer (
- 'refund-new', // TODO: kill all the -new suffixes
+ 'refund',
variable_get('refund_batch_time', 0),
variable_get('refund_batch', 0)
diff --git a/sites/all/modules/wmf_audit/wmf_audit.module
b/sites/all/modules/wmf_audit/wmf_audit.module
index c1dc9df..865491b 100644
--- a/sites/all/modules/wmf_audit/wmf_audit.module
+++ b/sites/all/modules/wmf_audit/wmf_audit.module
@@ -399,8 +399,8 @@
function wmf_audit_send_queue_message( $body, $type ) {
$configKeys = array(
'main' => 'data-store/donations',
- 'negative' => 'data-store/refund-new', // FIXME: almost ready to do away
with -new
- 'recurring' => 'data-store/recurring-new',
+ 'negative' => 'data-store/refund',
+ 'recurring' => 'data-store/recurring',
);
if (!array_key_exists($type, $configKeys)) {
--
To view, visit https://gerrit.wikimedia.org/r/348109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3c9c2e442ddcc83a0ff6dce09af9d10d1de5e977
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
