fizx-proxymachine 1.6.1 → 1.7.0

data/fizx-proxymachine.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   ## 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.6.1'
+  s.version           = '1.7.0'
   s.date              = '2011-05-07'
   s.rubyforge_project = 'fizx-proxymachine'
 
@@ -48,10 +48,10 @@ Gem::Specification.new do |s|
 
   ## 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<rake>, ["~> 0.8.7"])
   s.add_development_dependency(%q<shoulda>, ["~> 2.11.3"])
-  s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-  s.add_development_dependency("ruby-debug")
+  # s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+  # s.add_development_dependency("ruby-debug")
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE

data/lib/proxymachine.rb

@@ -6,6 +6,7 @@ require 'socket'
 
 require 'proxymachine/client_connection'
 require 'proxymachine/server_connection'
+require 'proxymachine/warning_server_connection'
 require 'proxymachine/callback_server_connection'
 
 $logger = Logger.new(STDOUT)
@@ -85,10 +86,18 @@ class ProxyMachine
   def self.set_inactivity_error_callback(&block)
     @@inactivity_error_callback = block
   end
+  
+  def self.set_inactivity_warning_callback(&block)
+    @@inactivity_warning_callback = block
+  end
 
   def self.inactivity_error_callback
     @@inactivity_error_callback
   end
+  
+  def self.inactivity_warning_callback
+    @@inactivity_warning_callback
+  end
 
   def self.run(name, host, port)
     @@totalcounter = 0
@@ -98,6 +107,7 @@ class ProxyMachine
     @@listen = "#{host}:#{port}"
     @@connect_error_callback ||= proc { |remote| }
     @@inactivity_error_callback ||= proc { |remote| }
+    @@inactivity_warning_callback ||= proc { |remote| }
     self.update_procline
     EM.epoll
 
@@ -128,4 +138,9 @@ module Kernel
   def proxy_inactivity_error(&block)
     ProxyMachine.set_inactivity_error_callback(&block)
   end
+  
+  def proxy_inactivity_warning(&block)
+    ProxyMachine.set_inactivity_warning_callback(&block)
+  end
+  
 end

data/lib/proxymachine/callback_server_connection.rb

@@ -1,9 +1,9 @@
 class ProxyMachine
-  class CallbackServerConnection < ServerConnection
-    
-    def post_init
-      # empty
-    end
+  class CallbackServerConnection < WarningServerConnection
+
+    # def post_init
+    #   # empty
+    # end
     
     def callback=(c)
       @callback = c

data/lib/proxymachine/client_connection.rb

@@ -45,6 +45,8 @@ class ProxyMachine
       try_connect
     end
     
+    attr_reader :inactivity_warning_timeout, :inactivity_warning_callback
+    
     def try_connect
       @commands = @routes.shift
       $logger.info "#{peer} #{@commands.inspect}"
@@ -60,8 +62,10 @@ class ProxyMachine
         end
         @connect_timeout = @commands[:connect_timeout]
         @inactivity_timeout = @commands[:inactivity_timeout]
+        @inactivity_warning_timeout = @commands[:inactivity_warning_timeout]
         @connect_error_callback = @commands[:connect_error_callback]
         @inactivity_error_callback = @commands[:inactivity_error_callback]
+        @inactivity_warning_callback = @commands[:inactivity_warning_callback]
         connect_to_server
       elsif close = @commands[:close]
         if close == true
@@ -83,7 +87,7 @@ class ProxyMachine
       host, port = @remote
       $logger.info "Establishing new connection with #{host}:#{port}"
       cb = @commands[:callback]
-      klass = cb ? CallbackServerConnection : ServerConnection
+      klass = cb ? CallbackServerConnection : WarningServerConnection
       @server_side = klass.request(host, port, self)
       @server_side.callback = cb if cb
       @server_side.pending_connect_timeout = @connect_timeout
@@ -100,6 +104,12 @@ class ProxyMachine
       @buffer = []
       proxy_incoming_to(@server_side, 10240)
     end
+    
+    def inactivity_warning_triggered
+      proc {
+        (@inactivity_warning_callback || ProxyMachine.inactivity_warning_callback).call(@remote.join(':'))
+      }
+    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.

data/test/configs/simple.rb

@@ -1,4 +1,4 @@
-$logger = Logger.new(File.new('/dev/null', 'w'))
+$logger = Logger.new(File.new('/tmp/proxymachine-server-test', 'w'))
 
 callback = proc do |data|
   data + ":callback"
@@ -24,18 +24,23 @@ proxy do |data|
   elsif data == 'connect reject'
     { :remote => "localhost:9989" }
   elsif data == 'inactivity'
-    { :remote => "localhost:9980", :data => 'sleep 3', :inactivity_timeout => 1 }
+    { :remote => "localhost:9980", :data => 'sleep 3', :inactivity_timeout => 1, :inactivity_warning_timeout => 0.5 }
   else
     { :close => true }
   end
 end
 
-ERROR_FILE = File.expand_path('/tmp/proxy_error', __FILE__)
+ERROR_FILE = '/tmp/proxy_error'
+WARN_FILE = '/tmp/proxy_warn'
 
 proxy_connect_error do |remote|
   File.open(ERROR_FILE, 'wb') { |fd| fd.write("connect error: #{remote}") }
 end
 
+proxy_inactivity_warning do |remote|
+  File.open(WARN_FILE, 'wb') { |fd| fd.write("activity warning: #{remote}") }
+end
+
 proxy_inactivity_error do |remote|
   File.open(ERROR_FILE, 'wb') { |fd| fd.write("activity error: #{remote}") }
 end

data/test/proxymachine_test.rb

@@ -9,10 +9,8 @@ end
 
 class ProxymachineTest < Test::Unit::TestCase
   def setup
-    @proxy_error_file = "#{File.dirname(__FILE__)}/proxy_error"
-    puts "g"
-    # require "ruby-debug"
-    # debugger
+    @proxy_error_file = '/tmp/proxy_error'
+    @proxy_warn_file = '/tmp/proxy_warn'
   end
 
   def teardown
@@ -20,13 +18,11 @@ class ProxymachineTest < Test::Unit::TestCase
   end
 
   should "handle simple routing" do
-    puts "h"
     assert_proxy('localhost', 9990, 'a', '9980:a')
     assert_proxy('localhost', 9990, 'b', '9981:b')
   end
 
   should "handle connection closing" do
-    puts "hi1"
     sock = TCPSocket.new('localhost', 9990)
     sock.write('xxx')
     assert_equal nil, sock.read(1)
@@ -34,22 +30,18 @@ class ProxymachineTest < Test::Unit::TestCase
   end
 
   should "handle rewrite routing" do
-    puts "hi2"
     assert_proxy('localhost', 9990, 'c', '9980:ccc')
   end
 
   should "handle rewrite closing" do
-    puts "hi3"
-        assert_proxy('localhost', 9990, 'd', 'ddd')
+    assert_proxy('localhost', 9990, 'd', 'ddd')
   end
 
   should "handle data plus reply" do
-        puts "hi4"
     assert_proxy('localhost', 9990, 'g', 'g3-9980:g2')
   end
 
   should "handle noop" do
-        puts "hi5"
     sock = TCPSocket.new('localhost', 9990)
     sock.write('e' * 2048)
     sock.flush
@@ -59,34 +51,42 @@ class ProxymachineTest < Test::Unit::TestCase
   end
 
   should "execute a callback" do
-        puts "hi6"
     assert_proxy('localhost', 9990, 'h', '9980:h:callback')
   end
   
-  # should "call proxy_connect_error when a connection is rejected" do
-  #       puts "hi7"
-  #   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_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
-  #       puts "hi8"
-  #   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 "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 "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)
+    assert_equal "activity warning: localhost:9980", File.read(@proxy_warn_file)
+    sock.close
+  end
 
   should "not consider client disconnect a server error" do
-        puts "hi9"
     sock = TCPSocket.new('localhost', 9990)
     sock.write('inactivity')
     sock.close

metadata

@@ -1,84 +1,49 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fizx-proxymachine
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.7.0
   prerelease: 
-  version: 1.6.1
 platform: ruby
-authors: 
+authors:
 - Tom Preston-Werner
 - Kyle Maxwell
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-07 00:00:00 -07:00
-default_executable: proxymachine
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-05-07 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70266777049060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.12.10
   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 
+  version_requirements: *70266777049060
+- !ruby/object:Gem::Dependency
   name: shoulda
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70266777047880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !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
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id005
-description: ProxyMachine is a simple content aware (layer 7) TCP routing proxy written in Ruby with EventMachine.
+  version_requirements: *70266777047880
+description: ProxyMachine is a simple content aware (layer 7) TCP routing proxy written
+  in Ruby with EventMachine.
 email: tom@mojombo.com
-executables: 
+executables:
 - proxymachine
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE
-files: 
+files:
 - Gemfile
 - History.txt
 - LICENSE
@@ -97,33 +62,30 @@ files:
 - test/configs/simple.rb
 - test/proxymachine_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/fizx/proxymachine
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: fizx-proxymachine
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 2
 summary: ProxyMachine is a simple content aware (layer 7) TCP routing proxy.
-test_files: 
+test_files:
 - test/proxymachine_test.rb