fizx-proxymachine 1.3.0 → 1.4.0

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/History.txt

@@ -1,3 +1,27 @@
+= 1.2.4 / 2011-02-01
+  * Bug fixes
+    * Fix version number in procline
+    * Unrequire rubygems. Some people consider this a bug.
+
+= 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
+
+= 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
+    * Inactivity Timeouts
+  * Enhancements
+    * Better async retry logic
+
 = 1.1.0 / 2009-11-05
   * New Features
     * Add { :remote, :data, :reply } command [github.com/coderrr]
@@ -19,4 +43,4 @@
 
 = 0.2.7 / 2009-10-12
   * Minor changes
-    * Use a 10k buffer to prevent memory growth due to slow clients
+    * Use a 10k buffer to prevent memory growth due to slow clients

data/README.md

@@ -112,6 +112,48 @@ Valid return values
 `{ :close => true }` - Close the connection.  
 `{ :close => String }` - Close the connection after sending the String.  
 
+Connection Errors and Timeouts
+------------------------------
+
+It's possible to register a custom callback for handling connection
+errors. The callback is passed the remote when a connection is either
+rejected or a connection timeout occurs:
+
+    proxy do |data|
+      if data =~ /your thing/
+        { :remote => 'localhost:1234', :connect_timeout => 1.0 }
+      else
+        { :noop => true }
+      end
+    end
+
+    proxy_connect_error do |remote|
+      puts "error connecting to #{remote}"
+    end
+
+You must provide a `:connect_timeout` value in the `proxy` return value
+to enable connection timeouts. The `:connect_timeout` value is a float
+representing the number of seconds to wait before a connection is
+established. Hard connection rejections always trigger the callback, even
+when no `:connect_timeout` is provided.
+
+Inactivity Timeouts
+-------------------
+
+Inactivity timeouts work like connect timeouts but are triggered after
+the configured amount of time elapses without receiving the first byte
+of data from an already connected server:
+
+    proxy do |data|
+      { :remote => 'localhost:1234', :inactivity_timeout => 10.0 }
+    end
+
+    proxy_inactivity_error do |remote|
+      puts "#{remote} did not send any data for 10 seconds"
+    end
+
+If no `:inactivity_timeout` is provided, the `proxy_inactivity_error`
+callback is never triggered.
 
 Contribute
 ----------

data/Rakefile

@@ -1,23 +1,50 @@
 require 'rubygems'
 require 'rake'
+require 'date'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "fizx-proxymachine"
-    gem.summary = %Q{ProxyMachine is a simple content aware (layer 7) TCP routing proxy.}
-    gem.email = "tom@mojombo.com"
-    gem.homepage = "http://github.com/fizx/proxymachine"
-    gem.authors = ["Tom Preston-Werner", "Kyle Maxwell"]
-    gem.add_dependency('eventmachine', '>= 0.12.10')
-
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+#############################################################################
+#
+# Helper functions
+#
+#############################################################################
+
+def name
+  @name ||= Dir['*.gemspec'].first.split('.').first
+end
+
+def version
+  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
+  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
+end
+
+def date
+  Date.today.to_s
 end
 
+def rubyforge_project
+  name
+end
+
+def gemspec_file
+  "#{name}.gemspec"
+end
+
+def gem_file
+  "#{name}-#{version}.gem"
+end
+
+def replace_header(head, header_name)
+  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
+end
+
+#############################################################################
+#
+# Standard tasks
+#
+#############################################################################
+
+task :default => :test
+
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -25,34 +52,99 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+desc "Generate RCov test coverage and open in your browser"
+task :coverage do
+  require 'rcov'
+  sh "rm -fr coverage"
+  sh "rcov test/test_*.rb"
+  sh "open coverage/index.html"
 end
 
-
-task :default => :test
-
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION.yml')
-    config = YAML.load(File.read('VERSION.yml'))
-    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-  else
-    version = ""
-  end
-
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "proxymachine #{version}"
+  rdoc.title = "#{name} #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+desc "Open an irb session preloaded with this library"
+task :console do
+  sh "irb -rubygems -r ./lib/#{name}.rb"
+end
+
+#############################################################################
+#
+# Custom tasks (add your own tasks here)
+#
+#############################################################################
+
+
+
+#############################################################################
+#
+# Packaging tasks
+#
+#############################################################################
+
+desc "Create tag v#{version} and build and push #{gem_file} to Rubygems"
+task :release => :build do
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
+    exit!
+  end
+  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git tag v#{version}"
+  sh "git push origin master"
+  sh "git push origin v#{version}"
+  sh "gem push pkg/#{name}-#{version}.gem"
+end
+
+desc "Build #{gem_file} into the pkg directory"
+task :build => :gemspec do
+  sh "mkdir -p pkg"
+  sh "gem build #{gemspec_file}"
+  sh "mv #{gem_file} pkg"
+end
+
+desc "Generate #{gemspec_file}"
+task :gemspec => :validate do
+  # read spec file and split out manifest section
+  spec = File.read(gemspec_file)
+  head, manifest, tail = spec.split("  # = MANIFEST =\n")
+
+  # replace name version and date
+  replace_header(head, :name)
+  replace_header(head, :version)
+  replace_header(head, :date)
+  #comment this out if your rubyforge_project has a different name
+  replace_header(head, :rubyforge_project)
+
+  # determine file list from git ls-files
+  files = `git ls-files`.
+    split("\n").
+    sort.
+    reject { |file| file =~ /^\./ }.
+    reject { |file| file =~ /^(rdoc|pkg)/ }.
+    map { |file| "    #{file}" }.
+    join("\n")
+
+  # piece file back together and write
+  manifest = "  s.files = %w[\n#{files}\n  ]\n"
+  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
+  File.open(gemspec_file, 'w') { |io| io.write(spec) }
+  puts "Updated #{gemspec_file}"
+end
+
+desc "Validate #{gemspec_file}"
+task :validate do
+  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
+  # unless libfiles.empty?
+  #   puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
+  #   exit!
+  # end
+  unless Dir['VERSION*'].empty?
+    puts "A `VERSION` file at root level violates Gem best practices."
+    exit!
+  end
+end

data/fizx-proxymachine.gemspec

@@ -1,69 +1,84 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
+## This is the rakegem gemspec template. Make sure you read and understand
+## all of the comments. Some sections require modification, and others can
+## be deleted if you don't need them. Once you understand the contents of
+## this file, feel free to delete any comments that begin with two hash marks.
+## You can find comprehensive Gem::Specification documentation, at
+## http://docs.rubygems.org/read/chapter/20
 Gem::Specification.new do |s|
-  s.name = %q{fizx-proxymachine}
-  s.version = "1.3.0"
-
+  s.specification_version = 2 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Tom Preston-Werner", "Kyle Maxwell"]
-  s.date = %q{2010-01-20}
-  s.default_executable = %q{proxymachine}
-  s.email = %q{tom@mojombo.com}
+  s.rubygems_version = '1.3.5'
+
+  ## Leave these as is they will be modified for you by the rake gemspec task.
+  ## If your rubyforge_project name is different, then edit it and comment out
+  ## the sub! line in the Rakefile
+  s.name              = 'fizx-proxymachine'
+  s.version           = '1.4.0'
+  s.date              = '2011-05-07'
+  s.rubyforge_project = 'fizx-proxymachine'
+
+  ## Make sure your summary is short. The description may be as long
+  ## as you like.
+  s.summary     = "ProxyMachine is a simple content aware (layer 7) TCP routing proxy."
+  s.description = "ProxyMachine is a simple content aware (layer 7) TCP routing proxy written in Ruby with EventMachine."
+
+  ## List the primary authors. If there are a bunch of authors, it's probably
+  ## better to set the email to an email list or something. If you don't have
+  ## a custom homepage, consider using your GitHub URL or the like.
+  s.authors  = ["Tom Preston-Werner", "Kyle Maxwell"]
+  s.email    = 'tom@mojombo.com'
+  s.homepage = 'http://github.com/fizx/proxymachine'
+
+  ## This gets added to the $LOAD_PATH so that 'lib/NAME.rb' can be required as
+  ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
+  s.require_paths = %w[lib]
+
+  ## If your gem includes any executables, list them here.
   s.executables = ["proxymachine"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.md"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "History.txt",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION.yml",
-     "bin/proxymachine",
-     "examples/git.rb",
-     "examples/long.rb",
-     "examples/transparent.rb",
-     "fizx-proxymachine.gemspec",
-     "lib/fizx_proxymachine.rb",
-     "lib/proxymachine.rb",
-     "lib/proxymachine/callback_server_connection.rb",
-     "lib/proxymachine/client_connection.rb",
-     "lib/proxymachine/server_connection.rb",
-     "test/configs/simple.rb",
-     "test/proxymachine_test.rb",
-     "test/test_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/fizx/proxymachine}
+  s.default_executable = 'proxymachine'
+
+  ## Specify any RDoc options here. You'll want to add your README and
+  ## LICENSE files to the extra_rdoc_files list.
   s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{ProxyMachine is a simple content aware (layer 7) TCP routing proxy.}
-  s.test_files = [
-    "test/configs/simple.rb",
-     "test/proxymachine_test.rb",
-     "test/test_helper.rb",
-     "examples/git.rb",
-     "examples/long.rb",
-     "examples/transparent.rb"
-  ]
+  s.extra_rdoc_files = %w[README.md LICENSE]
+
+  ## List your runtime dependencies here. Runtime dependencies are those
+  ## that are needed for an end user to actually USE your code.
+  s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.10"])
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  ## List your development dependencies here. Development dependencies are
+  ## those that are only needed during development
+  s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
+  s.add_development_dependency(%q<shoulda>, ["~> 2.11.3"])
+  s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<eventmachine>, [">= 0.12.10"])
-    else
-      s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
-    end
-  else
-    s.add_dependency(%q<eventmachine>, [">= 0.12.10"])
-  end
-end
+  ## Leave this section as-is. It will be automatically generated from the
+  ## contents of your Git repository via the gemspec task. DO NOT REMOVE
+  ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
+  # = MANIFEST =
+  s.files = %w[
+    Gemfile
+    History.txt
+    LICENSE
+    README.md
+    Rakefile
+    bin/proxymachine
+    examples/git.rb
+    examples/long.rb
+    examples/transparent.rb
+    fizx-proxymachine.gemspec
+    lib/fizx-proxymachine.rb
+    lib/proxymachine.rb
+    lib/proxymachine/callback_server_connection.rb
+    lib/proxymachine/client_connection.rb
+    lib/proxymachine/server_connection.rb
+    test/configs/simple.rb
+    test/proxymachine_test.rb
+    test/test_helper.rb
+  ]
+  # = MANIFEST =
 
+  ## Test files will be grabbed from the file list. Make sure the path glob
+  ## matches what you actually use.
+  s.test_files = s.files.select { |path| path =~ /^test\/.*_test\.rb$/ }
+end

data/lib/fizx-proxymachine.rb

@@ -0,0 +1,3 @@
+require File.dirname(__FILE__) + "/proxymachine"
+
+VERSION="1.4.0"

data/lib/proxymachine.rb

@@ -1,4 +1,4 @@
-require 'rubygems'
+require 'yaml'
 require 'eventmachine'
 require 'logger'
 require 'socket'
@@ -10,6 +10,8 @@ require 'proxymachine/callback_server_connection'
 $logger = Logger.new(STDOUT)
 
 class ProxyMachine
+  VERSION = '1.2.4'
+
   MAX_FAST_SHUTDOWN_SECONDS = 10
 
   def self.update_procline
@@ -71,12 +73,30 @@ class ProxyMachine
     end
   end
 
+  def self.set_connect_error_callback(&block)
+    @@connect_error_callback = block
+  end
+
+  def self.connect_error_callback
+    @@connect_error_callback
+  end
+
+  def self.set_inactivity_error_callback(&block)
+    @@inactivity_error_callback = block
+  end
+
+  def self.inactivity_error_callback
+    @@inactivity_error_callback
+  end
+
   def self.run(name, host, port)
     @@totalcounter = 0
     @@maxcounter = 0
     @@counter = 0
     @@name = name
     @@listen = "#{host}:#{port}"
+    @@connect_error_callback ||= proc { |remote| }
+    @@inactivity_error_callback ||= proc { |remote| }
     self.update_procline
     EM.epoll
 
@@ -93,19 +113,18 @@ class ProxyMachine
       end
     end
   end
-
-  def self.version
-    yml = YAML.load(File.read(File.join(File.dirname(__FILE__), *%w[.. VERSION.yml])))
-    "#{yml[:major]}.#{yml[:minor]}.#{yml[:patch]}"
-  rescue
-    'unknown'
-  end
-
-  VERSION = self.version
 end
 
 module Kernel
   def proxy(&block)
     ProxyMachine.set_router(block)
   end
-end
+
+  def proxy_connect_error(&block)
+    ProxyMachine.set_connect_error_callback(&block)
+  end
+
+  def proxy_inactivity_error(&block)
+    ProxyMachine.set_inactivity_error_callback(&block)
+  end
+end

data/lib/proxymachine/callback_server_connection.rb

@@ -13,8 +13,8 @@ class ProxyMachine
       @buffer ||= []
       @buffer << data
       if returned = @callback.call(@buffer.join(''))
-        proxy_incoming_to(@client_side, 10240)
         @client_side.send_data returned
+        proxy_incoming_to(@client_side, 10240)
       end
     rescue => e
       $logger.info e.message + e.backtrace.join("\n")

data/lib/proxymachine/client_connection.rb

@@ -10,7 +10,11 @@ class ProxyMachine
     def post_init
       $logger.info "Accepted #{peer}"
       @buffer = []
+      @remote = nil
       @tries = 0
+      @connected = false
+      @connect_timeout = nil
+      @inactivity_timeout = nil
       ProxyMachine.incr
     end
 
@@ -23,76 +27,103 @@ class ProxyMachine
     end
 
     def receive_data(data)
-      if !@server_side
+      if !@connected
         @buffer << data
-        ensure_server_side_connection
+        establish_remote_server if @remote.nil?
       end
     rescue => e
       close_connection
-      $logger.info "#{e.class} - #{e.message}"
+      $logger.error "#{e.class} - #{e.message}"
     end
 
-    def ensure_server_side_connection
-      @timer.cancel if @timer
-      unless @server_side
-        commands = ProxyMachine.router.call(@buffer.join)
-        $logger.info "#{peer} #{commands.inspect}"
-        close_connection unless commands.instance_of?(Hash)
-        if remote = commands[:remote]
-          m, host, port = *remote.match(/^(.+):(.+)$/)
-          klass = commands[:callback] ? CallbackServerConnection : ServerConnection
-          if try_server_connect(host, port.to_i, klass)
-            @server_side.callback = commands[:callback] if commands[:callback]
-            
-            if data = commands[:data]
-              @buffer = [data]
-            end
-            if reply = commands[:reply]
-              send_data(reply)
-            end
-            send_and_clear_buffer
-          end
-        elsif close = commands[:close]
-          if close == true
-            close_connection
-          else
-            send_data(close)
-            close_connection_after_writing
-          end
-        elsif commands[:noop]
-          # do nothing
-        else
+    # Called when new data is available from the client but no remote
+    # server has been established. If a remote can be established, an
+    # attempt is made to connect and proxy to the remote server.
+    def establish_remote_server
+      fail "establish_remote_server called with remote established" if @remote
+      @commands = ProxyMachine.router.call(@buffer.join)
+      $logger.info "#{peer} #{@commands.inspect}"
+      close_connection unless @commands.instance_of?(Hash)
+      if remote = @commands[:remote]
+        m, host, port = *remote.match(/^(.+):(.+)$/)
+        @remote = [host, port]
+        if data = @commands[:data]
+          @buffer = [data]
+        end
+        if reply = @commands[:reply]
+          send_data(reply)
+        end
+        @connect_timeout = @commands[:connect_timeout]
+        @inactivity_timeout = @commands[:inactivity_timeout]
+        connect_to_server
+      elsif close = @commands[:close]
+        if close == true
           close_connection
+        else
+          send_data(close)
+          close_connection_after_writing
         end
+      elsif @commands[:noop]
+        # do nothing
+      else
+        close_connection
       end
     end
 
-    def try_server_connect(host, port, klass)
+    # Connect to the remote server
+    def connect_to_server
+      fail "connect_server called without remote established" if @remote.nil?
+      host, port = @remote
+      $logger.info "Establishing new connection with #{host}:#{port}"
+      cb = @commands[:callback]
+      klass = cb ? CallbackServerConnection : ServerConnection
       @server_side = klass.request(host, port, self)
+      @server_side.callback = cb if cb
+      @server_side.pending_connect_timeout = @connect_timeout
+      @server_side.comm_inactivity_timeout = @inactivity_timeout
+    end
+
+    # Called by the server side immediately after the server connection was
+    # successfully established. Send any buffer we've accumulated and start
+    # raw proxying.
+    def server_connection_success
+      $logger.info "Successful connection to #{@remote.join(':')}"
+      @connected = true
+      @buffer.each { |data| @server_side.send_data(data) }
+      @buffer = []
       proxy_incoming_to(@server_side, 10240)
-      $logger.info "Successful connection to #{host}:#{port}."
-      true
-    rescue => e
-      if @tries < 10
+    end
+
+    # Called by the server side when a connection could not be established,
+    # either due to a hard connection failure or to a connection timeout.
+    # Leave the client connection open and retry the server connection up to
+    # 10 times.
+    def server_connection_failed
+      @server_side = nil
+      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 "Failed on server connect attempt #{@tries}. Trying again..."
-        @timer.cancel if @timer
-        @timer = EventMachine::Timer.new(0.1) do
-          self.ensure_server_side_connection
-        end
+        $logger.warn "Retrying connection with #{@remote.join(':')} (##{@tries})"
+        EM.add_timer(0.1) { connect_to_server }
       else
-        $logger.info "Failed after ten connection attempts."
+        $logger.error "Connect #{@remote.join(':')} failed after ten attempts."
+        close_connection
+        ProxyMachine.connect_error_callback.call(@remote.join(':'))
       end
-      false
     end
 
-    def send_and_clear_buffer
-      if !@buffer.empty?
-        @buffer.each do |x|
-          @server_side.send_data(x)
-        end
-        @buffer = []
-      end
+    # Called by the server when an inactivity timeout is detected. The timeout
+    # argument is the configured inactivity timeout in seconds as a float; the
+    # elapsed argument is the amount of time that actually elapsed since
+    # connecting but not receiving any data.
+    def server_inactivity_timeout(timeout, elapsed)
+      $logger.error "Disconnecting #{@remote.join(':')} after #{elapsed}s of inactivity (> #{timeout.inspect})"
+      @server_side = nil
+      close_connection
+      ProxyMachine.inactivity_error_callback.call(@remote.join(':'))
     end
 
     def unbind

data/lib/proxymachine/server_connection.rb

@@ -6,14 +6,45 @@ class ProxyMachine
 
     def initialize(conn)
       @client_side = conn
+      @connected = false
+      @data_received = false
+      @timeout = nil
     end
 
-    def post_init
+    def receive_data(data)
+      fail "receive_data called after raw proxy enabled" if @data_received
+      @data_received = true
+      @client_side.send_data(data)
       proxy_incoming_to(@client_side, 10240)
     end
 
+    def connection_completed
+      @connected = Time.now
+      @timeout = comm_inactivity_timeout || 0.0
+      @client_side.server_connection_success
+    end
+
     def unbind
-      @client_side.close_connection_after_writing
+      now = Time.now
+      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
+          # EM aborted the connection due to an inactivity timeout
+          @client_side.server_inactivity_timeout(@timeout, elapsed)
+        else
+          # server disconnected soon after connecting without sending data
+          # treat this like a failed server connection
+          @client_side.server_connection_failed
+        end
+      else
+        @client_side.close_connection_after_writing
+      end
     end
   end
 end

data/test/configs/simple.rb

@@ -21,7 +21,21 @@ proxy do |data|
     { :remote => "localhost:9980", :data => 'g2', :reply => 'g3-' }
   elsif data == 'h'
     { :remote => "localhost:9980", :callback => callback }
+  elsif data == 'connect reject'
+    { :remote => "localhost:9989" }
+  elsif data == 'inactivity'
+    { :remote => "localhost:9980", :data => 'sleep 3', :inactivity_timeout => 1 }
   else
     { :close => true }
   end
-end
+end
+
+ERROR_FILE = File.expand_path('../../proxy_error', __FILE__)
+
+proxy_connect_error do |remote|
+  File.open(ERROR_FILE, 'wb') { |fd| fd.write("connect error: #{remote}") }
+end
+
+proxy_inactivity_error do |remote|
+  File.open(ERROR_FILE, 'wb') { |fd| fd.write("activity error: #{remote}") }
+end

data/test/proxymachine_test.rb

@@ -8,6 +8,14 @@ def assert_proxy(host, port, send, recv)
 end
 
 class ProxymachineTest < Test::Unit::TestCase
+  def setup
+    @proxy_error_file = "#{File.dirname(__FILE__)}/proxy_error"
+  end
+
+  def teardown
+    File.unlink(@proxy_error_file) rescue nil
+  end
+
   should "handle simple routing" do
     assert_proxy('localhost', 9990, 'a', '9980:a')
     assert_proxy('localhost', 9990, 'b', '9981:b')
@@ -44,4 +52,32 @@ class ProxymachineTest < Test::Unit::TestCase
   should "execute a callback" do
     assert_proxy('localhost', 9990, 'h', '9980:h:callback')
   end
+  
+  should "call proxy_connect_error when a connection is rejected" do
+    sock = TCPSocket.new('localhost', 9990)
+    sock.write('connect reject')
+    sock.flush
+    assert_equal "", sock.read
+    sock.close
+    assert_equal "connect error: localhost:9989", File.read(@proxy_error_file)
+  end
+
+  should "call proxy_inactivity_error when initial read times out" do
+    sock = TCPSocket.new('localhost', 9990)
+    sent = Time.now
+    sock.write('inactivity')
+    sock.flush
+    assert_equal "", sock.read
+    assert_operator Time.now - sent, :>=, 1.0
+    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

data/test/test_helper.rb

@@ -17,6 +17,7 @@ module EventMachine
       end
 
       def receive_data(data)
+        sleep $1.to_f if data =~ /^sleep (.*)/
         send_data("#{@@port}:#{data}")
         close_connection_after_writing
       end
@@ -54,4 +55,4 @@ end
       EventMachine::Protocols::TestConnection.start('localhost', port)
     end
   end
-end
+end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: fizx-proxymachine
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  prerelease: 
+  version: 1.4.0
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -10,42 +11,74 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-20 00:00:00 -08:00
+date: 2011-05-07 00:00:00 -07:00
 default_executable: proxymachine
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.12.10
-    version: 
-description: 
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.8.7
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.11.3
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.5.2
+  type: :development
+  version_requirements: *id004
+description: ProxyMachine is a simple content aware (layer 7) TCP routing proxy written in Ruby with EventMachine.
 email: tom@mojombo.com
 executables: 
 - proxymachine
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README.md
+- LICENSE
 files: 
-- .document
-- .gitignore
+- Gemfile
 - History.txt
 - LICENSE
 - README.md
 - Rakefile
-- VERSION.yml
 - bin/proxymachine
 - examples/git.rb
 - examples/long.rb
 - examples/transparent.rb
 - fizx-proxymachine.gemspec
-- lib/fizx_proxymachine.rb
+- lib/fizx-proxymachine.rb
 - lib/proxymachine.rb
 - lib/proxymachine/callback_server_connection.rb
 - lib/proxymachine/client_connection.rb
@@ -63,28 +96,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.5
+rubyforge_project: fizx-proxymachine
+rubygems_version: 1.6.2
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: ProxyMachine is a simple content aware (layer 7) TCP routing proxy.
 test_files: 
-- test/configs/simple.rb
 - test/proxymachine_test.rb
-- test/test_helper.rb
-- examples/git.rb
-- examples/long.rb
-- examples/transparent.rb

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.gitignore

@@ -1,5 +0,0 @@
-*.sw?
-.DS_Store
-coverage
-rdoc
-pkg

data/VERSION.yml

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

data/lib/fizx_proxymachine.rb

@@ -1 +0,0 @@
-require File.dirname(__FILE__) + "/proxymachine"