rabbit_jobs 0.1.3 → 0.1.4

data/lib/rabbit_jobs/publisher.rb

@@ -20,42 +20,48 @@ module RabbitJobs
       raise ArgumentError unless routing_key && (routing_key.is_a?(Symbol) || routing_key.is_a?(String))
 
       begin
-        exchange = bunny.exchange(RJ.config[:exchange], RJ.config[:exchange_params])
-        queue = bunny.queue(RJ.config.queue_name(routing_key), RJ.config[:queues][routing_key.to_s])
-        queue.bind(exchange)
-
-        payload = {
-          'class' => klass.to_s,
-          'opts' => {'created_at' => Time.now.to_i},
-          'params' => params
-          }.to_json
-
-        exchange.publish(payload, Configuration::DEFAULT_MESSAGE_PARAMS.merge({key: routing_key.to_s}))
-        bunny.stop
+        with_bunny do |bunny|
+          exchange = bunny.exchange(RJ.config[:exchange], RJ.config[:exchange_params])
+          queue = bunny.queue(RJ.config.queue_name(routing_key), RJ.config[:queues][routing_key.to_s])
+          queue.bind(exchange)
+
+          payload = {
+            'class' => klass.to_s,
+            'opts' => {'created_at' => Time.now.to_i},
+            'params' => params
+            }.to_json
+
+          exchange.publish(payload, Configuration::DEFAULT_MESSAGE_PARAMS.merge({key: routing_key.to_s}))
+        end
       rescue
         RJ.logger.warn $!.inspect
         RJ.logger.warn $!.backtrace.join("\n")
       end
+
+      true
     end
 
     def purge_queue(*routing_keys)
       raise ArgumentError unless routing_keys && routing_keys.count > 0
 
       messages_count = 0
-      routing_keys.each do |routing_key|
-        queue = bunny.queue(RJ.config.queue_name(routing_key), RJ.config[:queues][routing_key.to_s])
-        messages_count += queue.status[:message_count]
-        queue.purge
+      with_bunny do |bunny|
+        routing_keys.each do |routing_key|
+          queue = bunny.queue(RJ.config.queue_name(routing_key), RJ.config[:queues][routing_key.to_s])
+          messages_count += queue.status[:message_count]
+          queue.purge
+        end
       end
-      bunny.stop
       return messages_count
     end
 
     private
-    def self.bunny
-      @bunny = Bunny.new(host: RJ.config.host, logging: true)
-      @bunny.start unless @bunny.status == :connected
-      @bunny
+    def self.with_bunny(&block)
+      raise ArgumentError unless block
+
+      Bunny.run(host: RJ.config.host, logging: true) do |bunny|
+        block.call(bunny)
+      end
     end
   end
 end

data/lib/rabbit_jobs/version.rb

@@ -1,3 +1,3 @@
 module RabbitJobs
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70172197056640 !ruby/object:Gem::Requirement
+  requirement: &70249915695980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70172197056640
+  version_requirements: *70249915695980
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &70172197056140 !ruby/object:Gem::Requirement
+  requirement: &70249915695480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70172197056140
+  version_requirements: *70249915695480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70172197055760 !ruby/object:Gem::Requirement
+  requirement: &70249915695100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172197055760
+  version_requirements: *70249915695100
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &70172197055220 !ruby/object:Gem::Requirement
+  requirement: &70249915694560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172197055220
+  version_requirements: *70249915694560
 description: Background jobs on RabbitMQ
 email:
 - lazureykis@gmail.com