tootsie 0.9.27 → 0.9.28

data/README.md

@@ -270,12 +270,12 @@ The queue options is a hash with a key `adapter` telling Tootsie which queue imp
 
 The `sqs` adapter takes the following options:
 
-    queue_name: <name of queue, defaults to 'tootsie'>
+    queue: <name of queue, defaults to 'tootsie'>
     max_backoff: <max seconds to wait when queue is empty, defaults to 2>
 
 For the `amqp` adapter:
 
-    queue_name: <name of queue, defaults to 'tootsie'>
+    queue: <name of queue, defaults to 'tootsie'>
     host_name: <host name of AMQP server, defaults to localhost>
     max_backoff: <max seconds to wait when queue is empty, defaults to 2>
 

data/Tootsie.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'xml-simple', ['~> 1.0.12']
   s.add_runtime_dependency 'thin', ['~> 1.2.7']
   s.add_runtime_dependency 's3', ['~> 0.3.8']
-  s.add_runtime_dependency 'bunny', ['~> 0.7.8']
+  s.add_runtime_dependency 'bunny', ['~> 0.8.0']
   s.add_runtime_dependency 'sqs', ['~> 0.1.2']
   s.add_runtime_dependency 'unicorn', ['~> 4.1.1']
   s.add_runtime_dependency 'i18n', ['>= 0.4.2']

data/lib/tootsie/queues/amqp_queue.rb

@@ -62,8 +62,9 @@ module Tootsie
       def with_reconnect(&block)
         begin
           result = yield
-        rescue Bunny::ServerDownError
-          @logger.error "Error connecting to AMQP server, retrying"
+        rescue Bunny::ServerDownError, Bunny::ConnectionError, Bunny::ProtocolError => e
+          @logger.error "Error in AMQP server connection (#{e.class}: #{e}), retrying"
+          sleep(0.5)
           connect!
           retry
         else
@@ -74,9 +75,8 @@ module Tootsie
       def with_retry(&block)
         begin
           result = yield
-        rescue Exception => exception
-          check_exception(exception)
-          @logger.error("Queue access failed with exception #{exception.class} (#{exception.message}), will retry")
+        rescue StandardError => e
+          @logger.error("Queue access failed with exception #{e.class} (#{e.message}), will retry")
           sleep(0.5)
           retry
         else
@@ -100,11 +100,6 @@ module Tootsie
         end
       end
 
-      def check_exception(exception)
-        raise exception if exception.is_a?(SystemExit)
-        raise exception if exception.is_a?(SignalException) and not exception.is_a?(Timeout::Error)
-      end
-    
   end
   
 end

data/lib/tootsie/version.rb

@@ -1,3 +1,3 @@
 module Tootsie
-  VERSION = '0.9.27'
+  VERSION = '0.9.28'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tootsie
 version: !ruby/object:Gem::Version
-  version: 0.9.27
+  version: 0.9.28
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.8
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.8
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: sqs
   requirement: !ruby/object:Gem::Requirement
@@ -326,7 +326,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3013484921319559554
+      hash: -2745809018023260649
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -335,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3013484921319559554
+      hash: -2745809018023260649
 requirements: []
 rubyforge_project: tootsie
 rubygems_version: 1.8.24