Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/349106 )
Change subject: Get rid of queue mirroring ...................................................................... Get rid of queue mirroring No longer using that Change-Id: Ie73dd1d531694e36f6770afbc3beec0508e85320 --- M extension.json M gateway_common/DonationQueue.php 2 files changed, 0 insertions(+), 27 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/06/349106/1 diff --git a/extension.json b/extension.json index b693bed..edb34e3 100644 --- a/extension.json +++ b/extension.json @@ -381,9 +381,6 @@ "banner-history": [], "_merge_strategy": "array_plus" }, - "DonationInterfaceQueueMirrors": { - "_merge_strategy": "array_plus" - }, "DonationInterfaceCustomFiltersActionRanges": { "process": [ 0, diff --git a/gateway_common/DonationQueue.php b/gateway_common/DonationQueue.php index 7abb5cb..97f4816 100644 --- a/gateway_common/DonationQueue.php +++ b/gateway_common/DonationQueue.php @@ -53,9 +53,6 @@ $properties = $this->buildHeaders( $transaction ); $message = $this->buildBody( $transaction ); $this->newBackend( $queue )->push( $message, $properties ); - - // FIXME: hack for new queue, remove - $this->mirror( $message, $queue ); } public function pop( $queue ) { @@ -74,27 +71,6 @@ $backend = $this->newBackend( $queue ); return $backend->peek(); - } - - /** - * Temporary measure to transition from key/value ActiveMQ to pure FIFO - * queues. Reads $wgDonationInterfaceQueueMirrors, where keys are original - * queue names and values are the queues to mirror to. - * - * @param array $message - * @param string $queue - */ - protected function mirror( $message, $queue ) { - global $wgDonationInterfaceQueueMirrors; - if ( array_key_exists( $queue, $wgDonationInterfaceQueueMirrors ) ) { - $mirrorQueue = $wgDonationInterfaceQueueMirrors[$queue]; - try { - $this->newBackend( $mirrorQueue )->push( $message ); - } catch ( Exception $ex ) { - // TODO: log. - // DonationLoggerFactory::getLogger()->warning( "Cannot mirror to {$mirrorQueue}: {$ex->getMessage()}" ); - } - } } /** -- To view, visit https://gerrit.wikimedia.org/r/349106 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie73dd1d531694e36f6770afbc3beec0508e85320 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Ejegg <eeggles...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits