eventq_rabbitmq 1.7.7 → 1.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60e5a3271b53e9ca20221e49bdb970935730e586
-  data.tar.gz: ee5f3fda4e16244475862d3bcdee03bbeeb82a2f
+  metadata.gz: 24ca73a8f2f4c29c8e93d9f05c348cfa8ac67587
+  data.tar.gz: 7234f3f45f4649865bc7e14030c7ae605392b761
 SHA512:
-  metadata.gz: 3c2d6c0381d3bad9aade432ac041ed413aefa7999ef16b35740df18b7c690fa5a1856f99037c0015c9c91612d5b99caf0b07bf7665b82890c63e75678b46e8a9
-  data.tar.gz: 6a6055eb4e150dbc61592f267d3cc2fa8ec946fecde7daf821628a6d505797dc72476ecad2988408ef9be96ae4cc36cfb62c28af59a4e6edd45db751ae0de0d5
+  metadata.gz: 24bf7380a5624c8470ef4f673059bf60eead657a5268f8b35e535462cc22b4069947d8426572dffa867a390b8aa11ac50e2f92d94cffcfca8ca1ae2d845fbc55
+  data.tar.gz: c7492e0b142d96634b4badd3be7b3d9b6865e22964261e1843e1b95cb8f69a3f0010bbd0285840ba7c1716659f5e7278afd02d57cab9ac15c58d867a39680148

data/lib/eventq_rabbitmq/rabbitmq_eventq_client.rb

@@ -15,7 +15,10 @@ module EventQ
       end
 
       def raise_event(event_type, event)
-        channel = @client.get_channel
+
+        connection = @client.get_connection
+        channel = connection.create_channel
+
         ex = @queue_manager.get_exchange(channel, @event_raised_exchange)
 
         qm = EventQ::QueueMessage.new
@@ -28,7 +31,7 @@ module EventQ
 
         ex.publish(message, :routing_key => event_type)
         channel.close
-        channel.connection.close
+        connection.close
 
         EventQ.logger.debug "[#{self.class}] - Raised event. Message: #{message} | Type: #{event_type}."
 

data/lib/eventq_rabbitmq/rabbitmq_queue_client.rb

@@ -30,20 +30,14 @@ module EventQ
             :pass => @password,
             :ssl => @ssl,
             :read_timeout => 2,
-            :heartbeat => 2,
-            :continuation_timeout => 5000,
+            :heartbeat => 10,
+            :continuation_timeout => 1000,
             :automatically_recover => true,
             :network_recovery_interval => 1,
             :recover_from_connection_close => true
         }
       end
 
-      def get_channel
-        conn = Bunny.new(connection_options)
-        conn.start
-        return conn.create_channel
-      end
-
       def get_connection
         conn = Bunny.new(connection_options)
         conn.start

data/lib/eventq_rabbitmq/rabbitmq_queue_manager.rb

@@ -5,14 +5,17 @@ module EventQ
       X_DEAD_LETTER_EXCHANGE = 'x-dead-letter-exchange'.freeze
       X_MESSAGE_TTL = 'x-message-ttl'.freeze
 
+      attr_accessor :durable
+
       def initialize
         @event_raised_exchange = EventQ::EventRaisedExchange.new
+        @durable = true
       end
 
       def get_queue(channel, queue)
 
         #get/create the queue
-        q = channel.queue(queue.name, :durable => true)
+        q = channel.queue(queue.name, :durable => @durable)
 
         if queue.allow_retry
           retry_exchange = get_retry_exchange(channel, queue)
@@ -42,20 +45,20 @@ module EventQ
 
           EventQ.log(:debug, "[#{self.class}] - Requesting retry queue. x-dead-letter-exchange: #{subscriber_exchange.name} | x-message-ttl: #{queue.max_retry_delay}")
 
-          return channel.queue("#{queue.name}.r", :durable => true, :arguments => { X_DEAD_LETTER_EXCHANGE => subscriber_exchange.name, X_MESSAGE_TTL => queue.max_retry_delay })
+          return channel.queue("#{queue.name}.r", :durable => @durable, :arguments => { X_DEAD_LETTER_EXCHANGE => subscriber_exchange.name, X_MESSAGE_TTL => queue.max_retry_delay })
 
         else
 
           EventQ.log(:debug, "[#{self.class}] - Requesting retry queue. x-dead-letter-exchange: #{subscriber_exchange.name} | x-message-ttl: #{queue.retry_delay}")
 
-          return channel.queue("#{queue.name}.r", :durable => true, :arguments => { X_DEAD_LETTER_EXCHANGE => subscriber_exchange.name, X_MESSAGE_TTL => queue.retry_delay })
+          return channel.queue("#{queue.name}.r", :durable => @durable, :arguments => { X_DEAD_LETTER_EXCHANGE => subscriber_exchange.name, X_MESSAGE_TTL => queue.retry_delay })
 
         end
 
       end
 
       def get_exchange(channel, exchange)
-        return channel.direct(exchange.name, :durable => true)
+        return channel.direct(exchange.name, :durable => @durable)
       end
 
     end

data/lib/eventq_rabbitmq/rabbitmq_queue_worker.rb

@@ -59,15 +59,22 @@ module EventQ
           }
         end
 
+        if !options.key?(:durable)
+          options[:durable] = true
+        end
+
+        client = options[:client]
+        manager = EventQ::RabbitMq::QueueManager.new
+        manager.durable = options[:durable]
+
+        connection = client.get_connection
+
         @threads = []
 
         #loop through each thread count
         @thread_count.times do
           thr = Thread.new do
 
-            client = options[:client]
-            manager = EventQ::RabbitMq::QueueManager.new
-
             #begin the queue loop for this thread
             while true do
 
@@ -77,9 +84,17 @@ module EventQ
               end
 
               begin
-                thread_process_iteration(client, manager, queue, block)
+
+                channel = connection.create_channel
+
+                thread_process_iteration(channel, manager, queue, block)
+
               rescue => e
-                EventQ.logger.error "An unhandled error occurred attempting to communicate with rabbitmq. Error: #{e} | Backtrace: #{e.backtrace}"
+                EventQ.logger.error "An unhandled error occurred attempting to communicate with RabbitMQ. Error: #{e} | Backtrace: #{e.backtrace}"
+              end
+
+              if channel != nil && channel.status != :closed
+                channel.close
               end
 
             end
@@ -91,16 +106,14 @@ module EventQ
 
         if options.key?(:wait) && options[:wait] == true
           @threads.each { |thr| thr.join }
+          connection.close
         end
 
         return true
 
       end
 
-      def thread_process_iteration(client, manager, queue, block)
-
-        connection = client.get_connection
-        channel = connection.create_channel
+      def thread_process_iteration(channel, manager, queue, block)
 
         #get the queue
         q = manager.get_queue(channel, queue)
@@ -138,9 +151,7 @@ module EventQ
 
             rescue => e
               EventQ.log(:error, "[#{self.class}] - An unhandled error happened attempting to process a queue message. Error: #{e} | Backtrace: #{e.backtrace}")
-
               error = true
-
             end
 
             if error || abort
@@ -154,7 +165,6 @@ module EventQ
         end
 
         channel.close
-        connection.close
 
         GC.start
 

data/lib/eventq_rabbitmq/rabbitmq_subscription_manager.rb

@@ -13,12 +13,16 @@ module EventQ
 
       def subscribe(event_type, queue)
 
-        channel = @client.get_channel
+        connection = @client.get_connection
+        channel = connection.create_channel
         queue = @queue_manager.get_queue(channel, queue)
         exchange = @queue_manager.get_exchange(channel, @event_raised_exchange)
 
         queue.bind(exchange, :routing_key => event_type)
 
+        channel.close
+        connection.close
+
         return true
       end
 

data/lib/eventq_rabbitmq/version.rb

@@ -1,3 +1,3 @@
 module EventqRabbitmq
-  VERSION = "1.7.7"
+  VERSION = "1.7.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventq_rabbitmq
 version: !ruby/object:Gem::Version
-  version: 1.7.7
+  version: 1.7.8
 platform: ruby
 authors:
 - vaughanbrittonsage