eventq_rabbitmq 1.18.0 → 1.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b46c2fdb9dd907c5a923d1bab7a816017896e8e7
-  data.tar.gz: 921e8ef146205bc884580936a5bb757600956fc7
+  metadata.gz: 5d2bb6547f6d4201f1874fb94225adbf9098445a
+  data.tar.gz: be299a1269ae2310faac7533a4e975b28c6581e1
 SHA512:
-  metadata.gz: c5cdb23b764e56bb9615337befd0a7cbd3ee7718c873087470ececb252c1c5bd6ddfbcda067f184dd2435f6fffa443cf2e20208eb0e9e8cfeaf2980a8c570b42
-  data.tar.gz: ea96de7b90757e49eb516853c913433a487506e456d110cd92f9493ea37589dcd24a80990ba5732c6eafe4c36053eb8c29ae3e6d513280c99f3a2b84ba15027e
+  metadata.gz: 4db1c3924ae4fbb984cb5535bb56d631dc097e2f803c766df1f7168b766025fc630f5483d0a19238e7cc55d22cc6238d6957a8fd8eca89ef35f6aca3c1a2b18c
+  data.tar.gz: 1d12c3fb36500cb3fdce0d2a6c4a373708cb6ce50ac8373a01b190b7b9feb8d7179e637a91cd64c10a2866c346654bf2b836777d049ac16d4a7ca51a34793e84

data/lib/eventq_rabbitmq/rabbitmq_queue_worker.rb

@@ -346,10 +346,14 @@ module EventQ
 
         @signature_provider_manager.validate_signature(message: message, queue: queue)
 
-        message_args = EventQ::MessageArgs.new(type: message.type,
-                                               retry_attempts: message.retry_attempts,
-                                               context: message.context,
-                                               content_type: message.content_type)
+        message_args = EventQ::MessageArgs.new(
+          type: message.type,
+          retry_attempts: message.retry_attempts,
+          context: message.context,
+          content_type: message.content_type,
+          id: message.id,
+          sent: message.created
+        )
 
         if(!EventQ::NonceManager.is_allowed?(message.id))
           EventQ.logger.info("[#{self.class}] - Duplicate Message received. Dropping message.")

data/lib/eventq_rabbitmq/rabbitmq_queue_worker_v2.rb

@@ -6,7 +6,6 @@ module EventQ
       attr_accessor :is_running
 
       def initialize
-        @threads = []
         @forks = []
         @is_running = false
 
@@ -16,8 +15,6 @@ module EventQ
         @hash_helper = HashKit::Helper.new
         @serialization_provider_manager = EventQ::SerializationProviders::Manager.new
         @signature_provider_manager = EventQ::SignatureProviders::Manager.new
-        @last_gc_flush = Time.now
-        @gc_flush_interval = 10
       end
 
       def start(queue, options = {}, &block)
@@ -68,33 +65,28 @@ module EventQ
           options[:durable] = true
         end
 
-        client = options[:client]
+        client = options[:client].dup
         manager = EventQ::RabbitMq::QueueManager.new
         manager.durable = options[:durable]
         @connection = client.get_connection
 
-        @threads = []
+        channel = @connection.create_channel
 
-        # loop through each thread count
-        @thread_count.times do
-          channel = @connection.create_channel
+        q = manager.get_queue(channel, queue)
+        retry_exchange = manager.get_retry_exchange(channel, queue)
 
-          q = manager.get_queue(channel, queue)
-          retry_exchange = manager.get_retry_exchange(channel, queue)
-
-          q.subscribe(:manual_ack => true, :consumer_tag => SecureRandom.uuid) do |delivery_info, properties, payload|
-            begin
-              tag_processing_thread
-              process_message(payload, queue, channel, retry_exchange, delivery_info.delivery_tag, block)
-            rescue => e
-              EventQ.logger.error(
-                "[#{self.class}] - An error occurred attempting to process a message. Error: #{e} | "\
+        q.subscribe(:manual_ack => true, :exclusive => false) do |delivery_info, properties, payload|
+          begin
+            tag_processing_thread
+            process_message(payload, queue, channel, retry_exchange, delivery_info.delivery_tag, block)
+          rescue => e
+            EventQ.logger.error(
+              "[#{self.class}] - An error occurred attempting to process a message. Error: #{e} | "\
 "Backtrace: #{e.backtrace}"
-              )
-              call_on_error_block(error: e)
-            ensure
-              untag_processing_thread
-            end
+            )
+            call_on_error_block(error: e)
+          ensure
+            untag_processing_thread
           end
         end
 
@@ -234,10 +226,12 @@ module EventQ
       def configure(queue, options = {})
         @queue = queue
 
-        # default thread count
-        @thread_count = 1
         if options.key?(:thread_count)
-          @thread_count = options[:thread_count]
+          EventQ.logger.warn("[#{self.class}] - :thread_count is deprecated.")
+        end
+
+        if options.key?(:sleep)
+          EventQ.logger.warn("[#{self.class}] - :sleep is deprecated.")
         end
 
         @fork_count = 1
@@ -246,8 +240,7 @@ module EventQ
         end
 
         EventQ.logger.info(
-          "[#{self.class}] - Configuring. Process Count: #{@fork_count} | Thread Count: #{@thread_count} | "\
-"Interval Sleep: #{@sleep}."
+          "[#{self.class}] - Configuring. Process Count: #{@fork_count}."
         )
 
         return true
@@ -264,10 +257,14 @@ module EventQ
 
         @signature_provider_manager.validate_signature(message: message, queue: queue)
 
-        message_args = EventQ::MessageArgs.new(type: message.type,
-                                               retry_attempts: message.retry_attempts,
-                                               context: message.context,
-                                               content_type: message.content_type)
+        message_args = EventQ::MessageArgs.new(
+          type: message.type,
+          retry_attempts: message.retry_attempts,
+          context: message.context,
+          content_type: message.content_type,
+          id: message.id,
+          sent: message.created
+        )
 
         if(!EventQ::NonceManager.is_allowed?(message.id))
           EventQ.logger.info("[#{self.class}] - Duplicate Message received. Dropping message.")

data/lib/eventq_rabbitmq/version.rb

@@ -1,3 +1,3 @@
 module EventqRabbitmq
-  VERSION = "1.18.0"
+  VERSION = "1.18.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventq_rabbitmq
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.18.1
 platform: ruby
 authors:
 - vaughanbrittonsage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement