eventq_rabbitmq 1.6.20 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffa92e29bdbb46174ff094aed246daf2e2583bf2
-  data.tar.gz: 3288a193efc8ac49bcf3fdf88778b7de48d88e60
+  metadata.gz: e5d18c5f1558513c4230028b4551794ed95f1b82
+  data.tar.gz: 219e41df27fe185358b86db4928b10b306e7aab1
 SHA512:
-  metadata.gz: 3100086d3bf2a228b7783ca62e652534f6d2c3533a235c40cc6847dd9499c9d39c693e1ef94fa809af59102af46cb4bf57133076525b965b01e80967dd9beb87
-  data.tar.gz: a09da0f86ddd2f134c118ee33ee41aad1227cfb8c5511ff4090a97c2640cecb016aebc91369deb7dd7aaee9a6e263f32c45febe3ba52d44bcf2df6788cab564b
+  metadata.gz: fb8df72733db2a36a7474ec4518c0be56c4b5220e77117b5ba576cdbea0456bc1cd9605ffe3b9798541abb8ca32ddfa4324515dccc8a770ba819d1f56b0704c3
+  data.tar.gz: 73f268f2d7c1c86179aa77eced1a165177fea070db9d0657219d3c8227eb324503863dcbd19691ca134f4fa819e88e10fa54e549102411ca66481f792e00da42

data/lib/eventq_rabbitmq/rabbitmq_queue_worker.rb

@@ -2,6 +2,8 @@ module EventQ
   module RabbitMq
     class QueueWorker
 
+      PROFILE_MEMORY = 'PROFILE_MEMORY'.freeze
+
       attr_accessor :is_running
 
       def initialize
@@ -78,85 +80,100 @@ module EventQ
                 break
               end
 
-              channel = connection.create_channel
+              if ENV[PROFILE_MEMORY] != nil
+                require 'memory_profiler'
 
-              #get the queue
-              q = manager.get_queue(channel, queue)
-              retry_exchange = manager.get_retry_exchange(channel, queue)
+                report = MemoryProfiler.report do
+                  thread_process_iteration(connection, manager, queue, block)
+                end
 
-              received = false
-              error = false
-              abort = false
+                EventQ.log(:debug, report.pretty_print.to_s)
 
-              begin
-                delivery_info, properties, payload = q.pop(:manual_ack => true, :block => true)
+              else
+                thread_process_iteration(connection, manager, queue, block)
+              end
 
-                #check that message was received
-                if payload != nil
+            end
 
-                  message = deserialize_message(payload)
+            connection.close
 
-                  EventQ.log(:debug, "[#{self.class}] - Message received. Retry Attempts: #{message.retry_attempts}")
+          end
+          @threads.push(thr)
 
-                  message_args = EventQ::MessageArgs.new(message.type, message.retry_attempts)
+        end
 
-                  #begin worker block for queue message
-                  begin
-                    block.call(message.content, message_args)
+        if options.key?(:wait) && options[:wait] == true
+          @threads.each { |thr| thr.join }
+        end
 
-                    if message_args.abort == true
-                      abort = true
-                      EventQ.log(:info, "[#{self.class}] - Message aborted.")
-                    else
-                      #accept the message as processed
-                      channel.acknowledge(delivery_info.delivery_tag, false)
-                      EventQ.log(:info, "[#{self.class}] - Message acknowledged.")
-                      received = true
-                    end
+        return true
 
-                  rescue => e
-                    EventQ.log(:error, "[#{self.class}] - An unhandled error happened attempting to process a queue message. Error: #{e}")
+      end
 
-                    error = true
+      def thread_process_iteration(connection, manager, queue, block)
+        channel = connection.create_channel
 
-                  end
+        #get the queue
+        q = manager.get_queue(channel, queue)
+        retry_exchange = manager.get_retry_exchange(channel, queue)
 
-                  if error || abort
-                    reject_message(channel, message, delivery_info, retry_exchange, queue)
-                  end
+        received = false
+        error = false
+        abort = false
 
-                end
+        begin
+          delivery_info, properties, payload = q.pop(:manual_ack => true, :block => true)
 
-              rescue Timeout::Error
-                EventQ.log(:error, "[#{self.class}] - Timeout occurred attempting to pop a message from the queue.")
-              end
+          #check that message was received
+          if payload != nil
+
+            message = deserialize_message(payload)
 
-              channel.close
+            EventQ.log(:debug, "[#{self.class}] - Message received. Retry Attempts: #{message.retry_attempts}")
 
-              GC.start
+            message_args = EventQ::MessageArgs.new(message.type, message.retry_attempts)
 
-              #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)
+            #begin worker block for queue message
+            begin
+              block.call(message.content, message_args)
+
+              if message_args.abort == true
+                abort = true
+                EventQ.log(:info, "[#{self.class}] - Message aborted.")
+              else
+                #accept the message as processed
+                channel.acknowledge(delivery_info.delivery_tag, false)
+                EventQ.log(:info, "[#{self.class}] - Message acknowledged.")
+                received = true
               end
 
+            rescue => e
+              EventQ.log(:error, "[#{self.class}] - An unhandled error happened attempting to process a queue message. Error: #{e}")
+
+              error = true
+
             end
 
-            connection.close
+            if error || abort
+              reject_message(channel, message, delivery_info, retry_exchange, queue)
+            end
 
           end
-          @threads.push(thr)
 
+        rescue Timeout::Error
+          EventQ.log(:error, "[#{self.class}] - Timeout occurred attempting to pop a message from the queue.")
         end
 
-        if options.key?(:wait) && options[:wait] == true
-          @threads.each { |thr| thr.join }
-        end
+        channel.close
 
-        return true
+        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)
+        end
       end
 
       def stop

data/lib/eventq_rabbitmq/version.rb

@@ -1,3 +1,3 @@
 module EventqRabbitmq
-  VERSION = "1.6.20"
+  VERSION = "1.7.0"
 end

metadata

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