Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/296185
Change subject: Don't default to _test queues
......................................................................
Don't default to _test queues
Let's make the defaults match between SmashPig, CRM, and DI
Change-Id: I48b91a679e6189017fb491cfb13b3fd62302474d
---
M sites/all/modules/globalcollect_audit/globalcollect_audit.module
M sites/all/modules/queue2civicrm/banner_history/banner_history.module
M sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
M sites/all/modules/queue2civicrm/queue2civicrm.module
M sites/all/modules/queue2civicrm/recurring/recurring.module
M sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
M sites/all/modules/queue2civicrm/unsubscribe/wmf_unsubscribe_qc.module
M sites/all/modules/wmf_audit/wmf_audit.module
8 files changed, 19 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/85/296185/1
diff --git a/sites/all/modules/globalcollect_audit/globalcollect_audit.module
b/sites/all/modules/globalcollect_audit/globalcollect_audit.module
index db026ad..b96bf33 100644
--- a/sites/all/modules/globalcollect_audit/globalcollect_audit.module
+++ b/sites/all/modules/globalcollect_audit/globalcollect_audit.module
@@ -2016,9 +2016,9 @@
// FIXME: register the queue mapping somewhere sane
if ( $queueId === 'donations' ) {
- $queuePath = variable_get( 'queue2civicrm_subscription', '/queue/test'
);
+ $queuePath = variable_get( 'queue2civicrm_subscription',
'/queue/donations' );
} elseif ( $queueId === 'refund' ) {
- $queuePath = variable_get( 'refund_queue',
'/queue/refund-notifications_test' );
+ $queuePath = variable_get( 'refund_queue', '/queue/refund' );
} else {
throw new Exception( "What kind of a queue is this??: {$queueId}" );
}
diff --git
a/sites/all/modules/queue2civicrm/banner_history/banner_history.module
b/sites/all/modules/queue2civicrm/banner_history/banner_history.module
index 7c8d9ea..52446d2 100644
--- a/sites/all/modules/queue2civicrm/banner_history/banner_history.module
+++ b/sites/all/modules/queue2civicrm/banner_history/banner_history.module
@@ -34,7 +34,7 @@
'#title' => t( 'Subscription path' ),
'#required' => true,
'#default_value' => variable_get(
- 'banner_history_queue', '/queue/banner-history-test' ),
+ 'banner_history_queue', '/queue/banner-history' ),
'#description' => t( 'Queue for banner history log ID
associations' ),
);
@@ -73,7 +73,7 @@
civicrm_initialize();
$processed = queue2civicrm_stomp()->dequeue_loop(
- variable_get( 'banner_history_queue',
'/queue/banner-history-test' ) ,
+ variable_get( 'banner_history_queue', '/queue/banner-history' )
,
variable_get( 'banner_history_batch', 0 ),
variable_get( 'banner_history_batch_time', 0 ),
'banner_history_process_message'
diff --git a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
index e5a631e..8a3ac11 100644
--- a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
+++ b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
@@ -33,7 +33,7 @@
'#type' => 'textfield',
'#title' => t('Payments-init subscription path'),
'#required' => TRUE,
- '#default_value' => variable_get('fredge_payments_init_queue',
'/queue/payments-init_test'),
+ '#default_value' => variable_get('fredge_payments_init_queue',
'/queue/payments-init'),
'#description' => t('Queue for payments-init items'),
);
@@ -41,7 +41,7 @@
'#type' => 'textfield',
'#title' => t('Payments-antifraud subscription path'),
'#required' => TRUE,
- '#default_value' => variable_get('fredge_payments_antifraud_queue',
'/queue/payments-antifraud_test'),
+ '#default_value' => variable_get('fredge_payments_antifraud_queue',
'/queue/payments-antifraud'),
'#description' => t('Queue for payments-antifraud items'),
);
// payments-antifraud
@@ -69,11 +69,11 @@
$dequeue_params = array(
'init' => array(
- 'queue' => variable_get('fredge_payments_init_queue',
'/queue/payments-init_test'),
+ 'queue' => variable_get('fredge_payments_init_queue',
'/queue/payments-init'),
'callback' => 'fredge_payments_init_process_message'
),
'fraud' => array(
- 'queue' => variable_get('fredge_payments_antifraud_queue',
'/queue/payments-antifraud_test'),
+ 'queue' => variable_get('fredge_payments_antifraud_queue',
'/queue/payments-antifraud'),
'callback' => 'fredge_payments_antifraud_process_message'
),
);
diff --git a/sites/all/modules/queue2civicrm/queue2civicrm.module
b/sites/all/modules/queue2civicrm/queue2civicrm.module
index d38ab90..7521a45 100644
--- a/sites/all/modules/queue2civicrm/queue2civicrm.module
+++ b/sites/all/modules/queue2civicrm/queue2civicrm.module
@@ -108,7 +108,7 @@
'#title' => t('Subscription path'),
'#description' => t('The queue holding normal, incoming donations waiting
to be processed.'),
'#required' => TRUE,
- '#default_value' => variable_get('queue2civicrm_subscription',
'/queue/test'),
+ '#default_value' => variable_get('queue2civicrm_subscription',
'/queue/donations'),
);
$form['queue2civicrm_batch'] = array(
@@ -178,7 +178,7 @@
}
$processed = queue2civicrm_stomp()->dequeue_loop(
- variable_get('queue2civicrm_subscription', '/queue/test'),
+ variable_get( 'queue2civicrm_subscription', '/queue/donations' ),
variable_get( 'queue2civicrm_batch', 0 ),
variable_get( 'queue2civicrm_batch_time', 0 ),
'queue2civicrm_import'
diff --git a/sites/all/modules/queue2civicrm/recurring/recurring.module
b/sites/all/modules/queue2civicrm/recurring/recurring.module
index 263024c..395b954 100644
--- a/sites/all/modules/queue2civicrm/recurring/recurring.module
+++ b/sites/all/modules/queue2civicrm/recurring/recurring.module
@@ -49,7 +49,7 @@
'#type' => 'textfield',
'#title' => t('Subscription path'),
'#required' => TRUE,
- '#default_value' => variable_get('recurring_subscription',
'/queue/test_recurring'),
+ '#default_value' => variable_get('recurring_subscription',
'/queue/donations_recurring'),
'#description' => t( 'Queue to watch for recurring notifications' ),
);
@@ -94,7 +94,7 @@
}
$recurring_processed = queue2civicrm_stomp()->dequeue_loop(
- variable_get( 'recurring_subscription', '/queue/test_recurring' ),
+ variable_get( 'recurring_subscription', '/queue/donations_recurring' ),
variable_get( 'recurring_batch', 0 ),
variable_get( 'recurring_batch_time', 0 ),
'recurring_import'
diff --git a/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
b/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
index 8fec9ce..24d0953 100644
--- a/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
+++ b/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
@@ -38,7 +38,7 @@
'#type' => 'textfield',
'#title' => t('Subscription path'),
'#required' => TRUE,
- '#default_value' => variable_get('refund_queue',
'/queue/refund-notifications_test'),
+ '#default_value' => variable_get('refund_queue', '/queue/refund'),
'#description' => t('Queue for refund notifications'),
);
@@ -95,7 +95,7 @@
$q = queue2civicrm_stomp();
$processed = $q->dequeue_loop(
- variable_get('refund_queue', '/queue/refund-notifications_test'),
+ variable_get('refund_queue', '/queue/refund'),
variable_get('refund_batch', 0),
variable_get('refund_batch_time', 0),
'refund_import'
diff --git
a/sites/all/modules/queue2civicrm/unsubscribe/wmf_unsubscribe_qc.module
b/sites/all/modules/queue2civicrm/unsubscribe/wmf_unsubscribe_qc.module
index 9e07ce0..502b6f4 100644
--- a/sites/all/modules/queue2civicrm/unsubscribe/wmf_unsubscribe_qc.module
+++ b/sites/all/modules/queue2civicrm/unsubscribe/wmf_unsubscribe_qc.module
@@ -38,7 +38,7 @@
'#type' => 'textfield',
'#title' => t('Subscription path'),
'#required' => TRUE,
- '#default_value' => variable_get('unsubscribe_queue',
'/queue/unsubscribe_test'),
+ '#default_value' => variable_get('unsubscribe_queue',
'/queue/unsubscribe'),
'#description' => t('Queue for unsubscribe items'),
);
@@ -85,7 +85,7 @@
civicrm_initialize();
$processed = queue2civicrm_stomp()->dequeue_loop(
- variable_get('unsubscribe_queue', '/queue/unsubscribe-test'),
+ variable_get('unsubscribe_queue', '/queue/unsubscribe'),
variable_get('unsubscribe_batch', 0),
variable_get('unsubscribe_batch_time', 0),
'unsubscribe_process_message'
diff --git a/sites/all/modules/wmf_audit/wmf_audit.module
b/sites/all/modules/wmf_audit/wmf_audit.module
index 298d31b..321ea3f 100644
--- a/sites/all/modules/wmf_audit/wmf_audit.module
+++ b/sites/all/modules/wmf_audit/wmf_audit.module
@@ -422,9 +422,9 @@
//there, this breaks.
if (empty($types)) {
$types = array(
- 'main' => variable_get('queue2civicrm_subscription', '/queue/test'),
- 'negative' => variable_get('refund_queue',
'/queue/refund-notifications_test'),
- 'recurring' => variable_get('recurring_subscription',
'/queue/test_recurring'),
+ 'main' => variable_get('queue2civicrm_subscription', '/queue/donations'),
+ 'negative' => variable_get('refund_queue', '/queue/refund_test'),
+ 'recurring' => variable_get('recurring_subscription',
'/queue/donations_recurring'),
);
}
--
To view, visit https://gerrit.wikimedia.org/r/296185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I48b91a679e6189017fb491cfb13b3fd62302474d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
