stapfen 1.4.0 → 1.4.1

data/lib/stapfen/version.rb

@@ -1,3 +1,3 @@
 module Stapfen
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

data/lib/stapfen/worker.rb

@@ -106,12 +106,16 @@ module Stapfen
       end
 
       begin
-        # Performing this join/open loop to make sure that we don't
+        # Performing this join/runningloop to make sure that we don't
         # experience potential deadlocks between signal handlers who might
         # close the connection, and an infinite Client#join call
-        while client.open? do
+        #
+        # Instead of using client#open? we use #running which will still be
+        # true even if the client is currently in an exponential reconnect loop
+        while client.running do
           client.join(1)
         end
+        warn("Exiting the runloop for #{self}")
       rescue Interrupt
         exit_cleanly
       end
@@ -122,7 +126,8 @@ module Stapfen
     def exit_cleanly
       self.class.destructor.call if self.class.destructor
 
-      unless client.closed?
+      # Only close the client if we have one sitting around
+      if client && !client.closed?
         client.close
       end
     end

data/spec/worker_spec.rb

@@ -54,7 +54,7 @@ describe Stapfen::Worker do
       end
 
       context 'unreceive behavior' do
-        let(:client) { mock('Stomp::Client', :open? => false) }
+        let(:client) { double('Stomp::Client', :running => false) }
         let(:name) { '/queue/some_queue' }
         before :each do
           Stomp::Client.stub(:new).and_return(client)
@@ -130,6 +130,18 @@ describe Stapfen::Worker do
         client.should_receive(:close)
         worker.exit_cleanly
       end
+
+      context 'with out having connected a client yet' do
+        before :each do
+          worker.stub(:client).and_return(nil)
+        end
+
+        it 'should not raise any errors' do
+          expect {
+            worker.exit_cleanly
+          }.not_to raise_error
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stapfen
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -63,7 +63,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2279092950717578506
+      hash: -1743593967546898414
 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: -2279092950717578506
+      hash: -1743593967546898414
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25