amqp-boilerplate 0.0.7 → 0.0.8

data/CHANGELOG

@@ -1,3 +1,8 @@
+= version 0.0.8
+
+  * [FEATURE] Do not start consumers when server type is unknown
+  * [ENHANCEMENT] Better logging
+
 = version 0.0.7
 
   * [ENHANCEMENT] Log payload when log level is debug

data/lib/amqp/boilerplate/version.rb

@@ -1,5 +1,5 @@
 module AMQP
   module Boilerplate
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/lib/amqp/boilerplate.rb

@@ -13,9 +13,16 @@ module AMQP
     extend ConsumerRegistry
     extend Logging
 
+    # Opens a channel to AMQP and starts all consumers
+    #
+    # NOTE When an unknown server type is encountered the consumers will NOT be
+    # started. A channel will be opened for the producers though.
+    #
+    # @see AMQP::Utilities::EventLoopHelper
+    # @return [void]
     def self.boot
-      if defined?(PhusionPassenger)
-        PhusionPassenger.on_event(:starting_worker_process) do |forked|
+      if AMQP::Utilities::EventLoopHelper.server_type == :passenger
+        ::PhusionPassenger.on_event(:starting_worker_process) do |forked|
           if forked
             Thread.new do
               AMQP::Boilerplate.start
@@ -30,13 +37,18 @@ module AMQP
 
       sleep(0.25)
 
-      AMQP::Boilerplate.logger.info("[#{self.name}.boot] Started AMQP (Server Type: #{AMQP::Utilities::EventLoopHelper.server_type})")
+      AMQP::Boilerplate.logger.info("[#{self.name}.boot] Started AMQP (Server Type: #{AMQP::Utilities::EventLoopHelper.server_type || 'unknown'})")
 
       EventMachine.next_tick do
         AMQP.channel ||= AMQP::Channel.new(AMQP.connection)
 
         load_consumers
-        start_consumers
+
+        if AMQP::Utilities::EventLoopHelper.server_type
+          start_consumers
+        else
+          AMQP::Boilerplate.logger.debug("[#{self.name}.boot] Unknown server type, not starting consumers")
+        end
       end
     end
 

data/spec/amqp/boilerplate_spec.rb

@@ -22,11 +22,6 @@ describe AMQP::Boilerplate do
       AMQP::Boilerplate.boot
     end
 
-    it "should start all consumers" do
-      AMQP::Boilerplate.should_receive(:start_consumers)
-      AMQP::Boilerplate.boot
-    end
-
     it "should connect to AMQP" do
       AMQP::Boilerplate.should_receive(:start)
       AMQP::Boilerplate.boot
@@ -37,15 +32,47 @@ describe AMQP::Boilerplate do
       AMQP::Boilerplate.boot
     end
 
+    describe "when server type is unknown" do
+      before(:each) do
+        AMQP::Utilities::EventLoopHelper.stub(:server_type).and_return(nil)
+      end
+
+      it "should not start consumers" do
+        AMQP::Boilerplate.should_not_receive(:start_consumers)
+        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
+      end
+
+      it "should log that consumers are not loaded" do
+        AMQP::Boilerplate.logger.should_receive(:debug).with(/Unknown server type, not starting consumers/)
+        AMQP::Boilerplate.boot
+      end
+    end
+
     describe "wen not using passenger" do
+      before(:each) do
+        AMQP::Utilities::EventLoopHelper.stub(:server_type).and_return(:mongrel)
+      end
+
       it "should use built-in EventLoopHelper" do
         AMQP::Utilities::EventLoopHelper.should_receive(:run)
         AMQP::Boilerplate.boot
       end
+
+      it "should start all consumers" do
+        AMQP::Boilerplate.should_receive(:start_consumers)
+        AMQP::Boilerplate.boot
+      end
     end
 
     describe "when using passenger" do
       before(:each) do
+        AMQP::Utilities::EventLoopHelper.stub(:server_type).and_return(:passenger)
+
         PhusionPassenger = Class.new
         PhusionPassenger.stub(:on_event).and_yield(true)
 
@@ -58,6 +85,11 @@ describe AMQP::Boilerplate do
         Object.send(:remove_const, "PhusionPassenger")
       end
 
+      it "should start all consumers" do
+        AMQP::Boilerplate.should_receive(:start_consumers)
+        AMQP::Boilerplate.boot
+      end
+
       it "should register to starting_worker_process event" do
         PhusionPassenger.should_receive(:on_event).with(:starting_worker_process)
         AMQP::Boilerplate.boot

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amqp-boilerplate
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Patrick Baselier
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-26 00:00:00 +02:00
+date: 2011-09-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency