fizx-proxymachine 1.7.1 → 1.8.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.7.1'
+  s.version           = '1.8.0'
   s.date              = '2011-05-07'
   s.rubyforge_project = 'fizx-proxymachine'
 
@@ -48,10 +48,8 @@ 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")
 
   ## 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

@@ -28,7 +28,8 @@ class ProxyMachine
     @@counter
   end
 
-  def self.incr
+  def self.incr(client = nil)
+    @@incr_callback && @@incr_callback.call(client)
     @@totalcounter += 1
     @@counter += 1
     @@maxcounter = @@counter if @@counter > @@maxcounter
@@ -36,7 +37,8 @@ class ProxyMachine
     @@counter
   end
 
-  def self.decr
+  def self.decr(client = nil)
+    @@decr_callback &&@@decr_callback.call(client)
     @@counter -= 1
     if $server.nil?
       $logger.info "Waiting for #{@@counter} connections to finish."
@@ -86,15 +88,31 @@ 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.set_incr_callback(&block)
+    @@incr_callback = block
+  end
+
+  def self.set_decr_callback(&block)
+    @@decr_callback = block
+  end
+
+  def self.incr_callback(&block)
+    @@incr_callback
+  end
+
+  def self.decr_callback(&block)
+    @@decr_callback
+  end
+
   def self.inactivity_error_callback
     @@inactivity_error_callback
   end
-  
+
   def self.inactivity_warning_callback
     @@inactivity_warning_callback
   end
@@ -108,6 +126,9 @@ class ProxyMachine
     @@connect_error_callback ||= proc { |remote| }
     @@inactivity_error_callback ||= proc { |remote| }
     @@inactivity_warning_callback ||= proc { |remote| }
+    @@incr_callback ||= proc { |remote| }
+    @@decr_callback ||= proc { |remote| }
+
     self.update_procline
     EM.epoll
 
@@ -138,9 +159,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/client_connection.rb

@@ -15,7 +15,7 @@ class ProxyMachine
       @connected = false
       @connect_timeout = nil
       @inactivity_timeout = nil
-      ProxyMachine.incr
+      ProxyMachine.incr(self)
     end
 
     def peer
@@ -39,14 +39,14 @@ class ProxyMachine
     # 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
+    def establish_remote_server(routes = nil)
       fail "establish_remote_server called with remote established" if @remote
-      @routes = [ProxyMachine.router.call(@buffer.join)].flatten
+      @routes = [routes || ProxyMachine.router.call(@buffer.join, self) || {}].flatten
       try_connect
     end
-    
+
     attr_reader :inactivity_warning_timeout, :inactivity_warning_callback
-    
+
     def try_connect
       @commands = @routes.shift
       $logger.info "#{peer} #{@commands.inspect}"
@@ -104,7 +104,7 @@ 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(':'))
@@ -145,7 +145,7 @@ class ProxyMachine
 
     def unbind
       @server_side.close_connection_after_writing if @server_side
-      ProxyMachine.decr
+      ProxyMachine.decr(self)
     end
 
     # Proxy connection has been lost

data/test/configs/simple.rb

@@ -4,7 +4,21 @@ callback = proc do |data|
   data + ":callback"
 end
 
-proxy do |data|
+class TestServerConnection < EventMachine::Connection
+  def self.request(host, port, callback)
+    EventMachine.connect(host, port, self, callback)
+  end
+
+  def initialize(callback)
+    @callback = callback
+  end
+
+  def receive_data(data)
+    @callback.call(data)
+  end
+end
+
+proxy do |data, conn|
   if data == 'a'
     { :remote => "localhost:9980" }
   elsif data == 'b'
@@ -25,6 +39,12 @@ proxy do |data|
     { :remote => "localhost:9989" }
   elsif data == 'inactivity'
     { :remote => "localhost:9980", :data => 'sleep 3', :inactivity_timeout => 1, :inactivity_warning_timeout => 0.5 }
+  elsif data == 'delayed'
+    sc = TestServerConnection.request("localhost", 9981, proc{
+      conn.establish_remote_server(:close => "ohai")
+    })
+    sc.send_data "delayed"
+    { :noop => true }
   else
     { :close => true }
   end

data/test/proxymachine_test.rb

@@ -41,6 +41,10 @@ class ProxymachineTest < Test::Unit::TestCase
     assert_proxy('localhost', 9990, 'g', 'g3-9980:g2')
   end
 
+  should "handle delayed routes" do
+    assert_proxy('localhost', 9990, 'delayed', 'ohai')
+  end
+
   should "handle noop" do
     sock = TCPSocket.new('localhost', 9990)
     sock.write('e' * 2048)
@@ -53,7 +57,7 @@ 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')
@@ -73,7 +77,7 @@ class ProxymachineTest < Test::Unit::TestCase
     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

metadata

@@ -2,7 +2,7 @@
 name: fizx-proxymachine
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -25,16 +25,27 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.11.3
+        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
 description: ProxyMachine is a simple content aware (layer 7) TCP routing proxy written in Ruby with EventMachine.
 email: tom@mojombo.com
 executables: 
@@ -87,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fizx-proxymachine
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 2
 summary: ProxyMachine is a simple content aware (layer 7) TCP routing proxy.