daemon_objects 0.1.8 → 0.1.9

data/lib/daemon_objects/amqp/runner.rb

@@ -1,16 +1,27 @@
 module DaemonObjects::AmqpSupport
-  attr_accessor :endpoint, :queue, :prefetch, :worker_class
+  attr_accessor :endpoint, :queue, :prefetch, :worker_class,
+    :retry_wait_time
 
   def arguments
     @arguments ||= {}
   end
 
+  def retry_wait_time
+    @retry_wait_time || 5
+  end
+
   def run
     logger.info "Preparing to start the AMQP watcher."
 
     connection = Bunny.new(endpoint) 
     connection.start
 
+    Signal.trap("INT") do
+      logger.info "Received signal 'INT'.  Exiting process"
+      connection.close { EventMachine.stop } 
+      exit
+    end
+
     logger.info "Starting up the AMQP watcher."
 
     channel  = connection.create_channel
@@ -28,9 +39,18 @@ module DaemonObjects::AmqpSupport
 
     logger.info "AMQP worker started"
 
-    Signal.trap("INT") do
-      logger.info "Received signal 'INT'.  Exiting process"
-      connection.close { EventMachine.stop } 
-    end
+  rescue Bunny::InternalError, Bunny::TCPConnectionFailed => e
+    logger.error(e) && e.backtrace.join("\n")
+    wait && retry
+  end
+
+  def wait
+    retry_message = "* Retrying connection in #{retry_wait_time} seconds .... *"
+    sleep(retry_wait_time)
+    logger.info("\n")
+    logger.info("*" * retry_message.length)
+    logger.info(retry_message)
+    logger.info("*" * retry_message.length)
+    logger.info("\n")
   end
 end

data/lib/daemon_objects/base.rb

@@ -5,11 +5,12 @@ class DaemonObjects::Base
 
   def self.consumes_amqp(opts={})
     extend DaemonObjects::AmqpSupport
-    self.endpoint = opts.delete(:endpoint)
-    self.queue    = opts.delete(:queue_name)
+    self.endpoint                   = opts.delete(:endpoint)
+    self.queue                      = opts.delete(:queue_name)
     self.arguments["x-message-ttl"] = opts.delete(:ttl) if opts[:ttl]
-    self.prefetch = opts.delete(:prefetch)
-    self.worker_class = opts.delete(:worker_class) || DaemonObjects::Amqp::Worker
+    self.prefetch                   = opts.delete(:prefetch)
+    self.retry_wait_time            = opts.delete(:retry_wait_time)
+    self.worker_class               = opts.delete(:worker_class) || DaemonObjects::Amqp::Worker
     self.arguments.merge!(opts)
 
     logger.info "Configured to consume queue [#{queue}] at endpoint [#{endpoint}]"

data/lib/daemon_objects/version.rb

@@ -1,3 +1,3 @@
 module DaemonObjects
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/spec/lib/daemon_objects/runner_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+describe DaemonObjects::AmqpSupport do
+  before :each do
+    MyWorker = Class.new(DaemonObjects::Amqp::Worker) do
+      def initialize(*args); end
+      def start; end
+      def self.counter
+        @counter ||= 0
+      end
+
+      def self.counter=(value)
+        @counter = value
+      end
+    end
+
+    MyConsumer = Class.new(DaemonObjects::ConsumerBase)
+    MyDaemon = Class.new(DaemonObjects::Base) do
+      consumes_amqp :endpoint        => 'amqp://localhost:4567',
+                    :queue_name      => 'queue',
+                    :worker_class    => MyWorker,
+                    :retry_wait_time => 0
+    end
+  end
+
+  after :each do
+    Object.send( :remove_const, :MyWorker) if defined?(MyWorker)
+    Object.send( :remove_const, :MyConsumer) if defined?(MyConsumer)
+    Object.send( :remove_const, :MyDaemon) if defined?(MyDaemon)
+  end
+
+  it 'should retry on initial connection if cannot connect' do
+
+    bunny = double(Bunny).as_null_object
+    # First attempt should raise and retry
+    Bunny.should_receive(:new).
+      with('amqp://localhost:4567'){
+        raise Bunny::TCPConnectionFailed.new("could not connect", "localhost", 4567)
+      }
+
+    # Second attempt succeeds to exit spec
+    Bunny.should_receive(:new).
+      with('amqp://localhost:4567').and_return(bunny)
+    MyDaemon.run
+  end
+
+  it 'should retry if connection is lost' do
+    bunny = double(Bunny).as_null_object
+
+    MyWorker.class_eval do
+      def start
+        self.class.counter += 1
+        # Only raise error on first attempt
+        raise Bunny::InternalError.new('lost connection', nil, true) if self.class.counter <= 1
+      end
+    end
+
+    Bunny.should_receive(:new).twice.
+      with('amqp://localhost:4567').and_return(bunny)
+
+    MyDaemon.run
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daemon_objects
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
@@ -140,6 +140,7 @@ files:
 - spec/lib/daemon_objects/base_spec.rb
 - spec/lib/daemon_objects/consumer_base_spec.rb
 - spec/lib/daemon_objects/logging_spec.rb
+- spec/lib/daemon_objects/runner_spec.rb
 - spec/lib/daemon_objects_spec.rb
 - spec/spec_helper.rb
 - spec/support/stub_logger.rb
@@ -174,6 +175,7 @@ test_files:
 - spec/lib/daemon_objects/base_spec.rb
 - spec/lib/daemon_objects/consumer_base_spec.rb
 - spec/lib/daemon_objects/logging_spec.rb
+- spec/lib/daemon_objects/runner_spec.rb
 - spec/lib/daemon_objects_spec.rb
 - spec/spec_helper.rb
 - spec/support/stub_logger.rb