amqp_helpers 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/amqp_helpers/daemon.rb

@@ -10,7 +10,7 @@ module AMQPHelpers
     class ConnectionError < Error; end
     class ChannelError < Error; end
 
-    DEFAULT_RECONNECT_WAIT_TIME = 30
+    DEFAULT_RECONNECT_WAIT_TIME = 10
 
     attr_accessor :name, :exchanges, :connection_params
     attr_writer :environment, :logger, :queue_name, :queue_params, :reconnect_wait_time
@@ -26,7 +26,10 @@ module AMQPHelpers
 
     def start(&handler)
       logger.info "Starting #{name} daemon..."
-      AMQP.start(connection_params) do |connection|
+      tcp_connection_failure_handler = Proc.new(&method(:handle_tcp_connection_failure))
+      amqp_params = { on_tcp_connection_failure: tcp_connection_failure_handler}.merge(connection_params)
+      AMQP.start(amqp_params) do |connection|
+        connection.on_open(&method(:handle_open))
         connection.on_error(&method(:handle_connection_error))
         channel = initialize_channel(connection)
         connection.on_tcp_connection_loss(&method(:handle_tcp_connection_loss))
@@ -35,11 +38,12 @@ module AMQPHelpers
         queue = initialize_queue(channel)
         queue.subscribe(&handler)
 
-        show_stopper = Proc.new do
-          logger.info "Signal INT received. #{name} is going down... I REPEAT: WE ARE GOING DOWN!"
+        show_stopper = Proc.new do |signal|
+          logger.info "Signal #{signal} received. #{name} is going down... I REPEAT: WE ARE GOING DOWN!"
           connection.close { EventMachine.stop }
         end
         Signal.trap 'INT', show_stopper
+        Signal.trap 'TERM', show_stopper
       end
     end
 
@@ -68,6 +72,15 @@ module AMQPHelpers
     end
 
     protected
+    def handle_tcp_connection_failure(settings)
+      logger.error "[network failure] Could not connect to #{settings[:host]}:#{settings[:port]}"
+      raise ConnectionError, "Failed to connect!"
+    end
+
+    def handle_open
+      logger.info "#{name} successfully opened AMQP connection"
+    end
+
     def handle_connection_error(connection, connection_close)
       logger.error "[connection.close] Reply code = #{connection_close.reply_code}, reply text = #{connection_close.reply_text}"
       # check if graceful broker shutdown
@@ -86,7 +99,7 @@ module AMQPHelpers
 
     def handle_tcp_connection_loss(connection, settings)
       logger.error '[network failure] Trying to reconnect...'
-      connection.reconnect(false, 10)
+      connection.reconnect(false, reconnect_wait_time)
     end
 
     def handle_recovery(connection, settings)

data/spec/daemon_spec.rb

@@ -46,6 +46,7 @@ describe AMQPHelpers::Daemon do
       connection.stub(:open?).and_return(true)
       connection.stub(:channel_max).and_return(0)
       connection.stub(:on_connection)
+      connection.stub(:on_recovery)
       connection.stub(:on_error)
       connection.stub(:on_tcp_connection_loss)
       connection.stub(:next_channel_id).and_return(0)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amqp_helpers
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: