Mwalker has submitted this change and it was merged.
Change subject: (FR #1279) Preserve message headers when rejecting and requeuing
......................................................................
(FR #1279) Preserve message headers when rejecting and requeuing
Change-Id: I6cb4e69342498ca9a33cbecc23791318892ac4c9
---
M sites/all/modules/wmf_common/wmf_common.module
1 file changed, 7 insertions(+), 3 deletions(-)
Approvals:
Mwalker: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/wmf_common/wmf_common.module
b/sites/all/modules/wmf_common/wmf_common.module
index 1a62060..7d75cfb 100644
--- a/sites/all/modules/wmf_common/wmf_common.module
+++ b/sites/all/modules/wmf_common/wmf_common.module
@@ -322,9 +322,9 @@
switch ( $form_state['values']['op'] ) {
case $form_state['values']['resend']:
- $q->enqueue( json_encode( $body ), $headers, $queue );
-
$msg = $q->getByAnyId( "{$queue}-damaged", $correlationId );
+ $q->enqueue( json_encode( $body ), $headers + $msg->headers, $queue );
+
$q->ack( $msg );
drupal_set_message( t( 'Message %id resent for processing.', array( '%id'
=> $correlationId ) ) );
@@ -352,5 +352,9 @@
$name = mime_header_encode( "{$correlationId}.json" );
drupal_add_http_header( 'Content-Type', 'application/json' );
drupal_add_http_header( 'Content-Disposition', "attachment;
filename=\"{$name}\"" );
- echo( $msg->body );
+ $data = json_encode( array(
+ 'headers' => $msg->headers,
+ 'body' => json_decode( $msg->body, true ),
+ ) );
+ echo( $data );
}
--
To view, visit https://gerrit.wikimedia.org/r/106474
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6cb4e69342498ca9a33cbecc23791318892ac4c9
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Adamw <[email protected]>
Gerrit-Reviewer: Mwalker <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
