proxymachine 1.2.2 → 1.2.3

data/History.txt

@@ -1,3 +1,7 @@
+= 1.2.3 / 2010-02-23
+  * Bug fixes
+    * Never retry after connection is established and data is sent
+
 = 1.2.2 / 2010-02-19
   * Bug fixes
     * Bring back the buffer limit

data/VERSION.yml

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

data/lib/proxymachine/client_connection.rb

@@ -33,7 +33,7 @@ class ProxyMachine
       end
     rescue => e
       close_connection
-      LOGGER.info "#{e.class} - #{e.message}"
+      LOGGER.error "#{e.class} - #{e.message}"
     end
 
     # Called when new data is available from the client but no remote
@@ -87,6 +87,7 @@ class ProxyMachine
       LOGGER.info "Successful connection to #{@remote.join(':')}"
       @connected = true
       @buffer.each { |data| @server_side.send_data(data) }
+      @buffer = []
       proxy_incoming_to(@server_side, 10240)
     end
 
@@ -96,12 +97,16 @@ class ProxyMachine
     # 10 times.
     def server_connection_failed
       @server_side = nil
-      if @tries < 10
+      if @connected
+        LOGGER.error "Connection with #{@remote.join(':')} was terminated prematurely."
+        close_connection
+        ProxyMachine.connect_error_callback.call(@remote.join(':'))
+      elsif @tries < 10
         @tries += 1
-        LOGGER.info "Retrying connection with #{@remote.join(':')} (##{@tries})"
+        LOGGER.warn "Retrying connection with #{@remote.join(':')} (##{@tries})"
         EM.add_timer(0.1) { connect_to_server }
       else
-        LOGGER.info "Connect #{@remote.join(':')} failed after ten attempts."
+        LOGGER.error "Connect #{@remote.join(':')} failed after ten attempts."
         close_connection
         ProxyMachine.connect_error_callback.call(@remote.join(':'))
       end
@@ -112,7 +117,7 @@ class ProxyMachine
     # elapsed argument is the amount of time that actually elapsed since
     # connecting but not receiving any data.
     def server_inactivity_timeout(timeout, elapsed)
-      LOGGER.info "Disconnecting #{@remote.join(':')} after #{elapsed}s of inactivity (> #{timeout.inspect})"
+      LOGGER.error "Disconnecting #{@remote.join(':')} after #{elapsed}s of inactivity (> #{timeout.inspect})"
       @server_side = nil
       close_connection
       ProxyMachine.inactivity_error_callback.call(@remote.join(':'))

data/proxymachine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{proxymachine}
-  s.version = "1.2.2"
+  s.version = "1.2.3"
 
   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-19}
+  s.date = %q{2010-02-23}
   s.default_executable = %q{proxymachine}
   s.email = %q{tom@mojombo.com}
   s.executables = ["proxymachine"]

metadata

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