eventq_rabbitmq 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb4f7be21507b6f13d60d45e646fba56a48b9413
-  data.tar.gz: 6070890b42376f67d1f75c0bc8b845accd0a39e5
+  metadata.gz: cb0a8aaadebe9b2fd3bbd557b3b4fb65e94dd4a8
+  data.tar.gz: bbd343360f66cf17b07673623723cbf9bae747d3
 SHA512:
-  metadata.gz: 98f43d173483b015c3aec399f2ceb4ac02153ef9968882a22adaa57b768904eadf4cbd4a78f688362343c426d298c3a1aae524d52999649deec0d63756f3f9a4
-  data.tar.gz: 116198501722596504454e1b7ffc2a38aee79f1af14664edc89964abb60cf9676a1a511d8b3377cbece082e346043cea8f6bb45d17d14fc8bd0d52ff70b4e384
+  metadata.gz: 953690b927906786332814a160c39c47557c57dd841f70c5b239e87384b7a42f696520ce223db3f14997abb2cddd92636bef933021d93a3ad8fb465610faec89
+  data.tar.gz: 0177d2cbd45c30dc636f245e1eddeba2e254a6e79c93f26b0a52f24ee2165abbdcd92f143eafa8151c082f1f6bcf15742fdbadddcc527ee13e25f28396eb81ac

data/lib/eventq_rabbitmq/rabbitmq_queue_worker.rb

@@ -6,6 +6,7 @@ module EventQ
 
       def initialize
         @threads = []
+        @forks = []
         @is_running = false
 
         @retry_exceeded_block = nil
@@ -15,15 +16,12 @@ module EventQ
 
       def start(queue, options = {}, &block)
 
-        Signal.trap('TERM') {
-          stop
-          exit
-        }
-
-        Signal.trap('INT') {
-          stop
-          exit
-        }
+        %w'INT TERM'.each do
+          Signal.trap('TERM') {
+            stop
+            exit
+          }
+        end
 
         EventQ.log(:info, "[#{self.class}] - Preparing to start listening for messages.")
 
@@ -38,24 +36,33 @@ module EventQ
         EventQ.log(:info, "[#{self.class}] - Listening for messages.")
 
         @forks = []
+
         if @fork_count > 1
           @fork_count.times do
             pid = fork do
-              Signal.trap('TERM') {
-                  @is_running = false
+
+              %w'INT TERM'.each do
+                Signal.trap('TERM') {
+                  stop
                   exit
-              }
+                }
+              end
+
               @is_running = true
               start_process(options, queue, block)
             end
             @forks.push(pid)
           end
+
+          if options.key?(:wait) && options[:wait] == true
+            @forks.each { |pid| Process.wait(pid) }
+          end
+
         else
           @is_running = true
           start_process(options, queue, block)
         end
 
-
       end
 
       def start_process(options, queue, block)
@@ -162,7 +169,7 @@ module EventQ
         puts "[#{self.class}] - Stopping..."
         @is_running = false
         if @forks.count > 1
-          @forks.each { |pid| Process.kill('TERM', pid) }
+          @forks.each { |pid| Process.kill('INT', pid) }
         else
           @threads.each { |thr| thr.join }
         end

data/lib/eventq_rabbitmq/version.rb

@@ -1,3 +1,3 @@
 module EventqRabbitmq
-  VERSION = "1.6.2"
+  VERSION = "1.6.3"
 end

metadata

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