stapfen 1.2.0 → 1.2.1

data/lib/stapfen/version.rb

@@ -1,3 +1,3 @@
 module Stapfen
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/lib/stapfen/worker.rb

@@ -6,12 +6,20 @@ module Stapfen
     include Stapfen::Logger
 
     class << self
-      attr_accessor :configuration, :consumers, :logger
+      attr_accessor :configuration, :consumers, :logger, :destructor
+      attr_accessor :workers
     end
 
     # Instantiate a new +Worker+ instance and run it
     def self.run!
-      self.new.run
+      worker = self.new
+
+      @workers ||= []
+      @workers << worker
+
+      handle_signals
+
+      worker.run
     end
 
     # Expects a block to be passed which will yield the appropriate
@@ -30,7 +38,6 @@ module Stapfen
       @logger = yield
     end
 
-
     # Main message consumption block
     def self.consume(queue_name, headers={}, &block)
       unless block_given?
@@ -40,14 +47,42 @@ module Stapfen
       @consumers << [queue_name, headers, block]
     end
 
-    attr_accessor :client
+    # Optional method, specifes a block to execute when the worker is shutting
+    # down.
+    def self.shutdown(&block)
+      @destructor = block
+    end
+
+    # Utility method to set up the proper worker signal handlers
+    def self.handle_signals
+      return if @signals_handled
+
+      Signal.trap(:INT) do
+        workers.each do |w|
+          w.exit_cleanly
+        end
+        exit!
+      end
+      Signal.trap(:TERM) do
+        workers.each do |w|
+          w.exit_cleanly
+        end
+      end
 
-    def initialize
-      handle_signals!
+      @signals_handled = true
     end
 
+
+
+    ############################################################################
+    # Instance Methods
+    ############################################################################
+
+    attr_accessor :client
+
     def run
       @client = Stomp::Client.new(self.class.configuration)
+      debug("Running with #{@client} inside of Thread:#{Thread.current.object_id}")
 
       self.class.consumers.each do |name, headers, block|
 
@@ -74,17 +109,11 @@ module Stapfen
       end
     end
 
-    def handle_signals!
-      Signal.trap(:INT) do
-        exit_cleanly
-        exit!
-      end
-      Signal.trap(:TERM) do
-        exit_cleanly
-      end
-    end
-
+    # Invokes the shutdown block if it has been created, and closes the
+    # {{Stomp::Client}} connection unless it has already been shut down
     def exit_cleanly
+      self.class.destructor.call if self.class.destructor
+
       unless client.closed?
         client.close
       end

data/spec/worker_spec.rb

@@ -10,7 +10,8 @@ describe Stapfen::Worker do
     it { should respond_to :run! }
     it { should respond_to :configure }
     it { should respond_to :consume }
-    it { should respond_to :logger }
+    it { should respond_to :log }
+    it { should respond_to :shutdown }
 
     describe '#configure' do
       it 'should error when not passed a block' do
@@ -54,4 +55,19 @@ describe Stapfen::Worker do
     end
   end
 
+  context 'instance methods' do
+    describe '#exit_cleanly' do
+      let(:client) { double('RSpec Stomp Client') }
+
+      before :each do
+        worker.stub(:client).and_return(client)
+      end
+
+      it 'should close the client' do
+        client.stub(:closed?).and_return(false)
+        client.should_receive(:close)
+        worker.exit_cleanly
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stapfen
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -63,7 +63,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -644536034951123366
+      hash: -3534259377773611788
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -644536034951123366
+      hash: -3534259377773611788
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25