tootsie 0.9.28 → 0.9.29

data/lib/tootsie/queues/amqp_queue.rb

@@ -9,7 +9,6 @@ module Tootsie
       @logger = Application.get.logger
       @host_name = options[:host_name] || 'localhost'
       @queue_name = options[:queue_name] || 'tootsie'
-      connect!
     end
     
     def count
@@ -19,7 +18,7 @@ module Tootsie
     def push(item)
       data = item.to_json
       with_retry do
-        with_reconnect do
+        with_connection do
           @exchange.publish(data, :persistent => true, :key => @queue_name)
         end
       end
@@ -31,7 +30,7 @@ module Tootsie
         @backoff.with do
           message = nil
           with_retry do
-            with_reconnect do
+            with_connection do
               message = @queue.pop(:ack => true)
             end
           end
@@ -41,7 +40,7 @@ module Tootsie
             if data
               @logger.info "Popped: #{data.inspect}"
               item = JSON.parse(data)
-              with_reconnect do
+              with_connection do
                 @queue.ack(:delivery_tag => message[:delivery_details][:delivery_tag])
               end
             end
@@ -59,13 +58,14 @@ module Tootsie
 
     private
 
-      def with_reconnect(&block)
+      def with_connection(&block)
         begin
+          connect! unless @connection
           result = yield
         rescue Bunny::ServerDownError, Bunny::ConnectionError, Bunny::ProtocolError => e
           @logger.error "Error in AMQP server connection (#{e.class}: #{e}), retrying"
+          @connection = nil
           sleep(0.5)
-          connect!
           retry
         else
           result
@@ -90,7 +90,7 @@ module Tootsie
 
           @connection = Bunny.new(:host => @host_name)
           @connection.start
-          
+
           @exchange = @connection.exchange('')
 
           @queue = @connection.queue(@queue_name, :durable => true)

data/lib/tootsie/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tootsie
 version: !ruby/object:Gem::Version
-  version: 0.9.28
+  version: 0.9.29
   prerelease: 
 platform: ruby
 authors:
@@ -326,7 +326,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2745809018023260649
+      hash: 1887276204761055397
 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: -2745809018023260649
+      hash: 1887276204761055397
 requirements: []
 rubyforge_project: tootsie
 rubygems_version: 1.8.24