Adamw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/96679
Change subject: strengthen reject() contract to always require an error
......................................................................
strengthen reject() contract to always require an error
Change-Id: I3f3793396525d3503ee4babeb32f011ce4bbdc64
---
M sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
M sites/all/modules/wmf_common/Queue.php
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/79/96679/1
diff --git a/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
b/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
index d4574ab..46cdfbd 100644
--- a/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
+++ b/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
@@ -122,7 +122,7 @@
if ($ex->isRejectMessage()) {
$error = "\nRemoving failed message from the queue: \n" .
print_r($msg_orig, TRUE);
- $q->reject($msg_orig);
+ $q->reject( $msg_orig, $ex );
watchdog('queue2civicrm', $error, NULL, WATCHDOG_ERROR);
}
diff --git a/sites/all/modules/wmf_common/Queue.php
b/sites/all/modules/wmf_common/Queue.php
index e694207..4b2aa0d 100644
--- a/sites/all/modules/wmf_common/Queue.php
+++ b/sites/all/modules/wmf_common/Queue.php
@@ -270,7 +270,7 @@
*
* @return string URL pointing to manual edit and requeuing of the newly
archived msg
*/
- function reject( $msg, $error = null ) {
+ function reject( $msg, WmfException $error ) {
$suffix = "-damaged";
//if ( strstr( $msg->headers['destination'], $suffix ) ) { ERROR
$msg->headers['destination'] .= $suffix;
--
To view, visit https://gerrit.wikimedia.org/r/96679
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f3793396525d3503ee4babeb32f011ce4bbdc64
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Adamw <awi...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
