amqp-boilerplate 1.1.4 → 1.2.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+= version 1.2.0
+
+  * [FEATURE] Added shutdown method that stops AMQP and EventMachine loop
+
 = version 1.1.4
 
   * [BUG] Prefetch option was not actually honored. Now it is :)
@@ -5,7 +9,7 @@
 = version 1.1.3
 
   * [ENHANCEMENT] Turned consumer prefetch into a global option (rverts change
-	in 1.1.2)
+  in 1.1.2)
 
 = version 1.1.2
 

data/lib/amqp/boilerplate.rb

@@ -49,6 +49,7 @@ module AMQP
         load_consumers
 
         if AMQP::Utilities::EventLoopHelper.server_type || force_consumers
+          AMQP::Boilerplate.logger.debug("[#{self.name}.boot] Starting consumers")
           start_consumers
         else
           AMQP::Boilerplate.logger.debug("[#{self.name}.boot] Unknown server type, not starting consumers")
@@ -56,6 +57,24 @@ module AMQP
       end
     end
 
+    # Try to gracefully close channel and stop EventMachine
+    #
+    # TODO Close all open channels and not just the default one
+    #
+    # @return [void]
+    def self.shutdown
+      AMQP.stop do
+        AMQP::Boilerplate.logger.debug("[#{self.name}.shutdown] Attempting graceful channel and EventMachine shutdown")
+        EventMachine.stop
+      end
+
+      # 5 seconds is an arbitrary delay
+      EventMachine::Timer.new(5) do
+        AMQP::Boilerplate.logger.debug("[#{self.name}.shutdown] Graceful shutdown of EM didn't work, forcing shutdown")
+        EventMachine.stop
+      end
+    end
+
     # Configures AMQP::Boilerplate and yields AMQP::Boilerplate object to the block
     #
     # @example

data/lib/amqp/boilerplate/producer.rb

@@ -92,12 +92,15 @@ module AMQP
         #
         # @see AMQP::Exchange#publish
         # @return [void]
-        def publish
+        def publish(&block)
+          block ||= lambda {
+            AMQP::Boilerplate.logger.debug "[#{self.class}] Message was published"
+          }
+
           message = send(self.class.amqp_boilerplate_message.to_sym)
           if message
-            exchange.publish(message, self.class.amqp_boilerplate_options) do
-              AMQP::Boilerplate.logger.debug "[#{self.class}] Published message:\n#{message}"
-            end
+            AMQP::Boilerplate.logger.debug "[#{self.class}] Publishing message:\n#{message}"
+            exchange.publish(message, self.class.amqp_boilerplate_options, &block)
           else
             AMQP::Boilerplate.logger.debug "[#{self.class}] Not publishing nil message"
           end

data/lib/amqp/boilerplate/version.rb

@@ -1,5 +1,5 @@
 module AMQP
   module Boilerplate
-    VERSION = "1.1.4"
+    VERSION = "1.2.0"
   end
 end

data/spec/amqp/boilerplate/producer_spec.rb

@@ -82,8 +82,15 @@ describe AMQP::Boilerplate::Producer do
     end
 
     it "should log after delivering message" do
-      AMQP::Boilerplate.logger.should_receive(:debug).with("[#{@producer.class}] Published message:\n#{@producer.message}")
+      AMQP::Boilerplate.logger.should_receive(:debug).with("[#{@producer.class}] Message was published")
       @producer.publish
     end
+
+    it "should yield to custom block when given" do
+      AMQP::Boilerplate.logger.should_receive(:debug).with("Custom block")
+      @producer.publish do
+        AMQP::Boilerplate.logger.debug("Custom block")
+      end
+    end
   end
 end

data/spec/amqp/boilerplate_spec.rb

@@ -49,7 +49,6 @@ describe AMQP::Boilerplate do
         AMQP::Boilerplate.boot
       end
 
-
       it "should log server type as 'unknown'" do
         AMQP::Boilerplate.logger.should_receive(:info).with(/Server Type: unknown/)
         AMQP::Boilerplate.boot
@@ -110,6 +109,30 @@ describe AMQP::Boilerplate do
     end
   end
 
+  describe ".shutdown" do
+    subject { described_class.shutdown }
+
+    before do
+      EventMachine::Timer.stub(:new).and_yield
+      EventMachine.stub(:stop)
+    end
+
+    it "closes AMQP connection" do
+      AMQP.should_receive(:stop)
+      subject
+    end
+
+    it "stops EventMachine" do
+      EventMachine.should_receive(:stop)
+      subject
+    end
+
+    it "sets a one-off timer to make sure event loop shuts down" do
+      EventMachine::Timer.should_receive(:new)
+      subject
+    end
+  end
+
   describe ".configure" do
     after(:each) do
       AMQP::Boilerplate.logger = nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amqp-boilerplate
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
-  - 4
-  version: 1.1.4
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Patrick Baselier
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-10 00:00:00 +02:00
+date: 2012-06-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency