proxymachine 1.2.0 → 1.2.1

data/History.txt

@@ -1,3 +1,7 @@
+= 1.2.1 / 2010-02-11
+  * Bug fixes
+    * Don't count client closes as connection errors
+
 = 1.2.0 / 2010-02-09
   * New Features
     * Connection Errors and Timeouts

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
 :minor: 2
-:patch: 0
+:patch: 1
 :build: 

data/lib/proxymachine/server_connection.rb

@@ -26,7 +26,12 @@ class ProxyMachine
 
     def unbind
       now = Time.now
-      if !@connected
+      if @client_side.error?
+        # the client side disconnected while we were in progress with
+        # the server. do nothing.
+        LOGGER.info "Client closed while server connection in progress. Dropping."
+      elsif !@connected
+        # a connection error or timeout occurred
         @client_side.server_connection_failed
       elsif !@data_received
         if @timeout > 0.0 && (elapsed = now - @connected) >= @timeout

data/proxymachine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{proxymachine}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2010-02-09}
+  s.date = %q{2010-02-11}
   s.default_executable = %q{proxymachine}
   s.email = %q{tom@mojombo.com}
   s.executables = ["proxymachine"]

data/test/proxymachine_test.rb

@@ -68,4 +68,12 @@ class ProxymachineTest < Test::Unit::TestCase
     assert_equal "activity error: localhost:9980", File.read(@proxy_error_file)
     sock.close
   end
+
+  should "not consider client disconnect a server error" do
+    sock = TCPSocket.new('localhost', 9990)
+    sock.write('inactivity')
+    sock.close
+    sleep 3.1
+    assert !File.exist?(@proxy_error_file)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: proxymachine
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-09 00:00:00 -08:00
+date: 2010-02-11 00:00:00 -08:00
 default_executable: proxymachine
 dependencies: 
 - !ruby/object:Gem::Dependency