From 0aa7cb3d0ee192fa95aee2eadd561501cedc3c69 Mon Sep 17 00:00:00 2001 From: vaughanbrittonsage Date: Mon, 24 Oct 2016 15:10:21 +0100 Subject: [PATCH] bugfix for eventq_rabbitmq regarding namespace implementation and serialization provider usage --- .../lib/eventq_rabbitmq/rabbitmq_queue_manager.rb | 4 +++- .../lib/eventq_rabbitmq/rabbitmq_queue_worker.rb | 2 +- eventq_rabbitmq/lib/eventq_rabbitmq/version.rb | 2 +- eventq_rabbitmq/script/Dockerfile | 14 +++++++------- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/eventq_rabbitmq/lib/eventq_rabbitmq/rabbitmq_queue_manager.rb b/eventq_rabbitmq/lib/eventq_rabbitmq/rabbitmq_queue_manager.rb index 1bb8578..650d9aa 100644 --- a/eventq_rabbitmq/lib/eventq_rabbitmq/rabbitmq_queue_manager.rb +++ b/eventq_rabbitmq/lib/eventq_rabbitmq/rabbitmq_queue_manager.rb @@ -14,8 +14,10 @@ def initialize def get_queue(channel, queue) + _queue_name = EventQ.create_queue_name(queue.name) + #get/create the queue - q = channel.queue(queue.name, :durable => @durable) + q = channel.queue(_queue_name, :durable => @durable) if queue.allow_retry retry_exchange = get_retry_exchange(channel, queue) diff --git a/eventq_rabbitmq/lib/eventq_rabbitmq/rabbitmq_queue_worker.rb b/eventq_rabbitmq/lib/eventq_rabbitmq/rabbitmq_queue_worker.rb index c0df35b..a25c013 100644 --- a/eventq_rabbitmq/lib/eventq_rabbitmq/rabbitmq_queue_worker.rb +++ b/eventq_rabbitmq/lib/eventq_rabbitmq/rabbitmq_queue_worker.rb @@ -223,7 +223,7 @@ def reject_message(channel, message, delivery_info, retry_exchange, queue) end EventQ.log(:debug, "[#{self.class}] - Sending message for retry. Message TTL: #{message_ttl}") - retry_exchange.publish(Oj.dump(message), :expiration => message_ttl) + retry_exchange.publish(serialize_message(message), :expiration => message_ttl) EventQ.log(:debug, "[#{self.class}] - Published message to retry exchange.") else diff --git a/eventq_rabbitmq/lib/eventq_rabbitmq/version.rb b/eventq_rabbitmq/lib/eventq_rabbitmq/version.rb index 754492a..c4da91e 100644 --- a/eventq_rabbitmq/lib/eventq_rabbitmq/version.rb +++ b/eventq_rabbitmq/lib/eventq_rabbitmq/version.rb @@ -1,3 +1,3 @@ module EventqRabbitmq - VERSION = "1.10.2" + VERSION = "1.10.3" end diff --git a/eventq_rabbitmq/script/Dockerfile b/eventq_rabbitmq/script/Dockerfile index 369edc1..e0219cd 100644 --- a/eventq_rabbitmq/script/Dockerfile +++ b/eventq_rabbitmq/script/Dockerfile @@ -1,8 +1,8 @@ -FROM codeguru/ruby:2.3.1-alpine-3.4 +FROM 522104923602.dkr.ecr.eu-west-1.amazonaws.com/sageone/sinatra:1.4.7-ruby-2.3.1-alpine-3.4 -RUN set -ex \ - && apk add --no-cache --virtual .gem-builddeps \ - ruby-dev build-base \ - && gem install -N json --version "1.8.3" -- --use-system-libraries \ - && gem install -N oj --version "2.15.0" -- --use-system-libraries \ - && apk del .gem-builddeps +#RUN set -ex \ +# && apk add --no-cache --virtual .gem-builddeps \ +# ruby-dev build-base \ +# && gem install -N json --version "1.8.3" -- --use-system-libraries \ +# && gem install -N oj --version "2.15.0" -- --use-system-libraries \ +# && apk del .gem-builddeps