rabbit_jobs 0.8.4 → 0.8.5

data/lib/rabbit_jobs/main_loop.rb

@@ -10,7 +10,7 @@ module RabbitJobs
     end
 
     def main_loop(time)
-      while true
+      loop do
         sleep 1
         if time > 0
           time -= 1

data/lib/rabbit_jobs/publisher.rb

@@ -22,8 +22,8 @@ module RabbitJobs
     def direct_publish_to(routing_key, payload, ex = {})
       check_connection
       begin
-        exchange_name = (ex.delete(:name) rescue nil).to_s # rescue for frozen hash
         exchange_opts = Configuration::DEFAULT_MESSAGE_PARAMS.merge(ex || {})
+        exchange_name = exchange_opts.delete(:name).to_s
         connection.default_channel.basic_publish(payload, exchange_name, routing_key, exchange_opts)
       rescue
         RabbitJobs.logger.warn $!.message
@@ -36,6 +36,7 @@ module RabbitJobs
 
     def purge_queue(*routing_keys)
       raise ArgumentError unless routing_keys.present?
+      check_connection
 
       messages_count = 0
       routing_keys.map(&:to_sym).each do |routing_key|
@@ -57,6 +58,7 @@ module RabbitJobs
       unless settings[:connection]
         settings[:connection] = Bunny.new(RabbitJobs.config.server, :heartbeat_interval => 5)
         settings[:connection].start
+        # settings[:channel] = settings[:connection].create_channel
         # settings[:channel].confirm_select
       end
       settings[:connection]

data/lib/rabbit_jobs/version.rb

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

data/lib/rabbit_jobs/worker.rb

@@ -60,7 +60,7 @@ module RabbitJobs
 
       begin
         amqp_channel = amqp_connection.create_channel
-        amqp_channel.prefetch(1)
+        # amqp_channel.prefetch(1)
 
         queues.each do |routing_key|
           consume_queue(amqp_channel, routing_key)
@@ -118,9 +118,10 @@ module RabbitJobs
 
       queue.subscribe(ack: explicit_ack) do |delivery_info, properties, payload|
         if consume_message(delivery_info, properties, payload)
-          amqp_channel.ack(delivery_info.delivery_tag, false) if explicit_ack
+          amqp_channel.ack(delivery_info.delivery_tag) if explicit_ack
         else
-          amqp_channel.nack(delivery_info.delivery_tag, true) if explicit_ack
+          requeue = false
+          amqp_channel.nack(delivery_info.delivery_tag, requeue) if explicit_ack
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &10058300 !ruby/object:Gem::Requirement
+  requirement: &15186800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.0.pre8
   type: :runtime
   prerelease: false
-  version_requirements: *10058300
+  version_requirements: *15186800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10057900 !ruby/object:Gem::Requirement
+  requirement: &15186260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10057900
+  version_requirements: *15186260
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &10057240 !ruby/object:Gem::Requirement
+  requirement: &15185680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *10057240
+  version_requirements: *15185680
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &10056660 !ruby/object:Gem::Requirement
+  requirement: &15185020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *10056660
+  version_requirements: *15185020
 description: Background jobs on RabbitMQ
 email:
 - lazureykis@gmail.com
@@ -117,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1879492991385784820
+      hash: -1922463039954072694
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1879492991385784820
+      hash: -1922463039954072694
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11