klomp 1.0.3 → 1.0.4

data/ChangeLog.md

@@ -1,6 +1,11 @@
 Klomp Changes
 --------------------------------------------------------------------------------
 
+1.0.4 (2012/10/10)
+================================================================================
+
+- Guard against sentinel creating a second one if it encounters exceptions
+
 1.0.3 (2012/10/10)
 ================================================================================
 

data/klomp.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "klomp"
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Sieger"]

data/lib/klomp.rb

@@ -1,5 +1,5 @@
 class Klomp
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 
   class Error < StandardError; end
 

data/lib/klomp/connection.rb

@@ -76,6 +76,7 @@ class Klomp
       subs = subscriptions.dup
       subscriptions.clear
       subs.each {|queue, subscriber| subscribe(queue, subscriber) }
+      @sentinel = nil
     end
 
     private
@@ -120,7 +121,7 @@ class Klomp
       return unless logger.debug?
       body = frame.body
       body = body.lines.first.chomp + '...' if body =~ /\n/
-      logger.debug "frame=#{frame.name} #{frame.headers.map{|k,v| k + '=' + v }.join(' ')} body=#{body}"
+      logger.debug "frame=#{frame.name} #{frame.headers.map{|k,v| k.to_s + '=' + v.to_s.inspect }.join(' ')} body=#{body}"
     end
 
     def log_exception(ex, level = :error, msg_start = '')
@@ -134,9 +135,10 @@ class Klomp
 
     def go_offline(ex)
       log_exception(ex, :warn, "offline server=#{options['server'].join(':')} ") if logger
+      return if @sentinel && @sentinel.alive?
       @socket.close rescue nil
       @socket = nil
-      Sentinel.new(self)
+      @sentinel = Sentinel.new(self)
       stop_subscriber_thread
     end
 

data/spec/klomp/connection_spec.rb

@@ -9,12 +9,13 @@ describe Klomp::Connection do
   Given(:logger)     { double("Logger", error:nil, warn:nil, info:nil, debug:nil).as_null_object }
   Given(:subscriber) { double "subscriber", call:nil }
   Given(:thread)     { double Thread }
+  Given(:sentinel)   { double Klomp::Sentinel, alive?:true }
 
   Given do
     IO.stub!(:select).and_return([[socket], [socket]])
     TCPSocket.stub!(:new).and_return socket
     Thread.stub!(:new).and_return {|*args,&blk| thread.stub!(:block => blk); thread }
-    Klomp::Sentinel.stub!(new: double("sentinel"))
+    Klomp::Sentinel.stub!(new: sentinel)
   end
 
   context "new" do
@@ -275,6 +276,16 @@ describe Klomp::Connection do
         Klomp::Sentinel.should have_received(:new).with(connection)
       end
 
+      context "only once" do
+
+        Then do
+          expect_publish.to raise_error(SystemCallError)
+          connection.send(:go_offline, begin; raise "error"; rescue; $!; end)
+          Klomp::Sentinel.should have_received(:new).with(connection).once
+        end
+
+      end
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klomp
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -224,7 +224,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3153745006188263140
+      hash: 1370034990818288756
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: