Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/367953 )
Change subject: Fixes for SmashPig update
......................................................................
Fixes for SmashPig update
Missed a couple of obsolete config usages for audit, replaced with
QueueWrapper. Also remove some no-longer-used use statements
Change-Id: I48238b777e78c310b1f1a1959af643a86e7ffb98
TODO: audit tests should look at queue messages
---
M sites/all/modules/globalcollect_audit/globalcollect_audit.drush.inc
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/ingenico/orphan_rectify.drush.inc
M sites/all/modules/wmf_audit/wmf_audit.module
10 files changed, 9 insertions(+), 41 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/53/367953/1
diff --git
a/sites/all/modules/globalcollect_audit/globalcollect_audit.drush.inc
b/sites/all/modules/globalcollect_audit/globalcollect_audit.drush.inc
index 3deb547..6f4a654 100644
--- a/sites/all/modules/globalcollect_audit/globalcollect_audit.drush.inc
+++ b/sites/all/modules/globalcollect_audit/globalcollect_audit.drush.inc
@@ -7,9 +7,6 @@
* @TODO print some useful info to STDOUT
*/
-use SmashPig\Core\Context;
-use SmashPig\Core\Configuration;
-
/**
* Implementation of hook_drush_command()
*/
diff --git a/sites/all/modules/globalcollect_audit/globalcollect_audit.module
b/sites/all/modules/globalcollect_audit/globalcollect_audit.module
index d0bdcde..4563706 100644
--- a/sites/all/modules/globalcollect_audit/globalcollect_audit.module
+++ b/sites/all/modules/globalcollect_audit/globalcollect_audit.module
@@ -1,5 +1,5 @@
<?php
-use SmashPig\Core\Configuration;
+use SmashPig\Core\DataStores\QueueWrapper;
define( 'GC_AUDIT_WR1_PARSER_DIR', '/usr/local/src/Wr1Parser/' );
define( 'GC_AUDIT_WR1_FILES_DIR', '/usr/local/src/Wr1_files/' );
@@ -1993,19 +1993,9 @@
function globalcollect_audit_send_queue_message( $queueId, $body ) {
- // FIXME: register the queue mapping somewhere sane
- if ( $queueId === 'donations' ) {
- $configKey = 'data-store/donations';
- } elseif ( $queueId === 'refund' ) {
- $configKey = 'data-store/refund';
- } else {
- throw new Exception( "What kind of a queue is this??: {$queueId}" );
- }
-
wmf_common_set_message_source( $body, 'audit', 'GlobalCollect WR1
Auditor' );
- $newQueue = Configuration::getDefaultConfig()->object( $configKey,
false );
- $newQueue->push( $body );
+ QueueWrapper::push( $queueId, $body );
}
/**
diff --git
a/sites/all/modules/queue2civicrm/banner_history/banner_history.module
b/sites/all/modules/queue2civicrm/banner_history/banner_history.module
index 9f0255c..468ca0b 100644
--- a/sites/all/modules/queue2civicrm/banner_history/banner_history.module
+++ b/sites/all/modules/queue2civicrm/banner_history/banner_history.module
@@ -1,8 +1,6 @@
<?php
use queue2civicrm\banner_history\BannerHistoryQueueConsumer;
-use SmashPig\Core\Configuration;
-use SmashPig\Core\Context;
/**
* Implements hook_menu
diff --git a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
index 8bc47d7..4dd223d 100644
--- a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
+++ b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
@@ -1,8 +1,6 @@
<?php
use queue2civicrm\fredge\AntifraudQueueConsumer;
use queue2civicrm\fredge\PaymentsInitQueueConsumer;
-use SmashPig\Core\Configuration;
-use SmashPig\Core\Context;
/**
* Implements hook_menu
diff --git a/sites/all/modules/queue2civicrm/queue2civicrm.module
b/sites/all/modules/queue2civicrm/queue2civicrm.module
index 50d424a..f7467bf 100644
--- a/sites/all/modules/queue2civicrm/queue2civicrm.module
+++ b/sites/all/modules/queue2civicrm/queue2civicrm.module
@@ -1,7 +1,5 @@
<?php
use queue2civicrm\DonationQueueConsumer;
-use SmashPig\Core\Configuration;
-use SmashPig\Core\Context;
// include common functions
require_once( drupal_get_path( 'module', 'queue2civicrm' ) .
'/queue2civicrm_common.inc' );
diff --git a/sites/all/modules/queue2civicrm/recurring/recurring.module
b/sites/all/modules/queue2civicrm/recurring/recurring.module
index 5a37e07..ff6d752 100644
--- a/sites/all/modules/queue2civicrm/recurring/recurring.module
+++ b/sites/all/modules/queue2civicrm/recurring/recurring.module
@@ -13,8 +13,6 @@
* uses the word in its field/variable names (eg subscr_payment).
*/
use queue2civicrm\recurring\RecurringQueueConsumer;
-use SmashPig\Core\Configuration;
-use SmashPig\Core\Context;
/**
* Implementation of hook_menu
diff --git a/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
b/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
index 3e55e89..8a52dc7 100644
--- a/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
+++ b/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
@@ -1,8 +1,6 @@
<?php
use queue2civicrm\refund\RefundQueueConsumer;
-use SmashPig\Core\Configuration;
-use SmashPig\Core\Context;
/**
* Implements hook_menu
*/
diff --git
a/sites/all/modules/queue2civicrm/unsubscribe/wmf_unsubscribe_qc.module
b/sites/all/modules/queue2civicrm/unsubscribe/wmf_unsubscribe_qc.module
index bcb20d1..3d336eb 100644
--- a/sites/all/modules/queue2civicrm/unsubscribe/wmf_unsubscribe_qc.module
+++ b/sites/all/modules/queue2civicrm/unsubscribe/wmf_unsubscribe_qc.module
@@ -1,8 +1,6 @@
<?php
use queue2civicrm\unsubscribe\UnsubscribeQueueConsumer;
-use SmashPig\Core\Configuration;
-use SmashPig\Core\Context;
/**
* Implements hook_menu
diff --git a/sites/all/modules/wmf_audit/ingenico/orphan_rectify.drush.inc
b/sites/all/modules/wmf_audit/ingenico/orphan_rectify.drush.inc
index f1eda7b..f357a63 100644
--- a/sites/all/modules/wmf_audit/ingenico/orphan_rectify.drush.inc
+++ b/sites/all/modules/wmf_audit/ingenico/orphan_rectify.drush.inc
@@ -3,9 +3,6 @@
* Detect and rectify recently orphaned Ingenico transactions
*/
-use SmashPig\Core\Configuration;
-use SmashPig\Core\Context;
-
/**
* Implementation of hook_drush_command()
*/
diff --git a/sites/all/modules/wmf_audit/wmf_audit.module
b/sites/all/modules/wmf_audit/wmf_audit.module
index fbf34d0..ddaa088 100644
--- a/sites/all/modules/wmf_audit/wmf_audit.module
+++ b/sites/all/modules/wmf_audit/wmf_audit.module
@@ -1,7 +1,6 @@
<?php
-use SmashPig\Core\Configuration;
-use SmashPig\Core\Context;
+use SmashPig\Core\DataStores\QueueWrapper;
define('WMF_AUDIT_PAYMENTS_LOGS_DIR', '/usr/local/src/logs/');
@@ -394,19 +393,16 @@
* @throws Exception
*/
function wmf_audit_send_queue_message( $body, $type ) {
- $configKeys = array(
- 'main' => 'data-store/donations',
- 'negative' => 'data-store/refund',
- 'recurring' => 'data-store/recurring',
+ $queueNames = array(
+ 'main' => 'donations',
+ 'negative' => 'refund',
+ 'recurring' => 'recurring',
);
- if (!array_key_exists($type, $configKeys)) {
+ if (!array_key_exists($type, $queueNames)) {
throw new Exception(__FUNCTION__ . ": Unhandled message type '$type'");
}
wmf_common_set_message_source($body, 'audit',
wmf_audit_runtime_options('submod_prefix') . ' Recon Auditor');
- $newQueue = Configuration::getDefaultConfig()->object(
- $configKeys[$type]
- );
- $newQueue->push( $body );
+ QueueWrapper::push( $queueNames[$type], $body );
}
--
To view, visit https://gerrit.wikimedia.org/r/367953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I48238b777e78c310b1f1a1959af643a86e7ffb98
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg <ej...@ejegg.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
