rabbit_jobs 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dff8d6171cd4174eef097c45b1882db5c00721fc
-  data.tar.gz: 38e0f6d1d73e3be81445ff5dec95c79155a07e43
+  metadata.gz: bbaa1fdb2d8e1c9716955755efa130be1eee820e
+  data.tar.gz: f2b6a65de1baff5a6b4696344ac4fe8d7bc5472c
 SHA512:
-  metadata.gz: 5054d1af4332fc96218d42b2c8fadc3b06286c688c76e9ce2af88f42c0d2a43a901c235105afaa7ca895a8fe22064b4ef261823ae51ee452ec64d47d4226de97
-  data.tar.gz: 7caadfdde460a34dd0004adf5cbce2658c7c94a49b1c397fc04212304b24c3a9a6985603a80ad46d71cd866074aff436fdcc3ce6acb324b65086b74e268225f2
+  metadata.gz: 0cd1995fc29516e21c31b0cdd5993e0184f06b25eef129d095e39cd83298c89d57206d795023ae21e22c817f947877a9cdedd075ab207e93062b29e99af47924
+  data.tar.gz: dd3ebbf992e689b3afabb00803b7159b89bb9088071b757c38ea3d4174478601ba234c7f2ee440d438768754f990312964cc1dd58242f026b068d82b9c570e63

data/lib/rabbit_jobs/main_loop.rb

@@ -21,7 +21,10 @@ module RabbitJobs
 
         if @shutdown
           RabbitJobs.logger.info "Stopping."
-          amqp_connection.stop if defined?(amqp_connection) # in worker only
+          if defined?(amqp_connection) # in worker only
+            amqp_connection.stop
+            amqp_channel.work_pool.join
+          end
           yield if block_given?
           return true
         end
@@ -38,4 +41,4 @@ module RabbitJobs
       end
     end
   end
-end
+end

data/lib/rabbit_jobs/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 
 module RabbitJobs
-  VERSION = "0.11.4"
+  VERSION = "0.11.5"
 end

data/lib/rabbit_jobs/worker.rb

@@ -17,6 +17,10 @@ module RabbitJobs
         properties: Bunny::Session::DEFAULT_CLIENT_PROPERTIES.merge(product: "rj_worker #{Process.pid}")).start
     end
 
+    def amqp_channel
+      @amqp_channel ||= amqp_connection.create_channel
+    end
+
     def self.cleanup
       conn = Thread.current[:rj_worker_connection]
       conn.close if conn && conn.status != :not_connected
@@ -60,11 +64,10 @@ module RabbitJobs
       @processed_count = 0
 
       begin
-        amqp_channel = amqp_connection.create_channel
         amqp_channel.prefetch(1)
 
         queues.each do |routing_key|
-          consume_queue(amqp_channel, routing_key)
+          consume_queue(routing_key)
         end
 
         RJ.logger.info "Started."
@@ -110,7 +113,7 @@ module RabbitJobs
       end
     end
 
-    def consume_queue(amqp_channel, routing_key)
+    def consume_queue(routing_key)
       RJ.logger.info "Subscribing to #{routing_key}"
       routing_key = routing_key.to_sym
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.5
 platform: ruby
 authors:
 - Pavel Lazureykis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -204,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Background jobs on RabbitMQ