eventq_rabbitmq 1.7.9 → 1.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0249aa24e7036f041eb1ec1fd8e9fcd1d5a1331d
-  data.tar.gz: b4887ed474c62e87804670ecd428469755bcbf1c
+  metadata.gz: c67f200ec80b84e8851066d2c3e56a9342e1e13f
+  data.tar.gz: b71b02f7fa301a2c6defad9748a9df57345bb32c
 SHA512:
-  metadata.gz: 1fabf20d9fffe7f4e2e474edda40cf610ef823b95dfca966b171883be5f42c980492b38b6a4b60a96821c4e6b3485d62c30d3b00d50ea0b461e294c773fcba32
-  data.tar.gz: 81cd6a969aedd1711d0ed7a677f457138185f5d7d1348d7d14ce006d7f1ac49792732d3acb7f086af9aa69effeece71ab97c16239f5a011a02b48c603cb9e02c
+  metadata.gz: 604c29e6c72cbcbb98bd5059d1f36d6194f7d6d658e7ec5a795b9485053285ed486a41387dc1e634e1235537097bd61c22a8f7d5de3543cfdc901938a4c09930
+  data.tar.gz: 3d9f83ee5a49a9b86bcd86546834c744ab8f4aaaace4af7c13b1076cf49740ba3e5d0a00e5ac5c1006aa60dc89f3353d0254525035ab4b8969c0c08917664183

data/lib/eventq_rabbitmq/rabbitmq_queue_client.rb

@@ -29,9 +29,9 @@ module EventQ
             :user => @user,
             :pass => @password,
             :ssl => @ssl,
-            :read_timeout => 2,
-            :heartbeat => 10,
-            :continuation_timeout => 1000,
+            :read_timeout => 4,
+            :heartbeat => 20,
+            :continuation_timeout => 5000,
             :automatically_recover => true,
             :network_recovery_interval => 1,
             :recover_from_connection_close => true

data/lib/eventq_rabbitmq/rabbitmq_queue_worker.rb

@@ -67,8 +67,6 @@ module EventQ
         manager = EventQ::RabbitMq::QueueManager.new
         manager.durable = options[:durable]
 
-        @connection = client.get_connection
-
         @threads = []
 
         #loop through each thread count
@@ -83,11 +81,14 @@ module EventQ
                 break
               end
 
+              has_processed = false
+
               begin
 
-                channel = @connection.create_channel
+                connection = client.get_connection
+                channel = connection.create_channel
 
-                thread_process_iteration(channel, manager, queue, block)
+                has_processed = 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}"
@@ -97,6 +98,15 @@ module EventQ
                 channel.close
               end
 
+              if connection != nil
+                connection.close
+              end
+
+              if !has_processed
+                EventQ.log(:debug, "[#{self.class}] - Sleeping for #{@sleep} seconds")
+                sleep(@sleep)
+              end
+
             end
 
           end
@@ -164,23 +174,21 @@ module EventQ
           EventQ.log(:error, "[#{self.class}] - An error occurred attempting to pop a message from the queue. Error: #{e} | Backtrace: #{e.backtrace}")
         end
 
-        channel.close
-
         GC.start
 
         #check if any message was received
         if !received && !error
-          EventQ.log(:debug, "[#{self.class}] - No message received. Sleeping for #{@sleep} seconds")
-          #no message received so sleep before attempting to pop another message from the queue
-          sleep(@sleep)
+          EventQ.log(:debug, "[#{self.class}] - No message received.")
+          return false
         end
+
+        return true
       end
 
       def stop
         puts "[#{self.class}] - Stopping..."
         @is_running = false
         @threads.each { |thr| thr.join }
-        @connection.close
         return true
       end
 

data/lib/eventq_rabbitmq/version.rb

@@ -1,3 +1,3 @@
 module EventqRabbitmq
-  VERSION = "1.7.9"
+  VERSION = "1.7.10"
 end

metadata

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