proxymachine 0.2.7 → 0.2.8

data/History.txt

@@ -1,3 +1,10 @@
+= 0.2.8 / 2009-10-14
+  * Minor changes
+    * Always log proxy connection
+    * Add version and total connection count to procline
+    * Add max connection count to procline
+    * Use Logger for logging
+
 = 0.2.7 / 2009-10-12
   * Minor changes
     * Use a 10k buffer to prevent memory growth due to slow clients

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 2
-:patch: 7
+:patch: 8
 :major: 0

data/bin/proxymachine

@@ -38,8 +38,8 @@ rescue Exception => e
   if e.instance_of?(SystemExit)
     raise
   else
-    puts 'Uncaught exception'
-    puts e.message
-    puts e.backtrace.join("\n")
+    LOGGER.info 'Uncaught exception'
+    LOGGER.info e.message
+    LOGGER.info e.backtrace.join("\n")
   end
 end

data/examples/git.rb

@@ -6,7 +6,7 @@ class GitRouter
   # Look at the routing table and return the correct address for +name+
   # Returns "<host>:<port>" e.g. "ae8f31c.example.com:9418"
   def self.lookup(name)
-    puts "Proxying for user #{name}"
+    LOGGER.info "Proxying for user #{name}"
     "localhost:9418"
   end
 end

data/lib/proxymachine/client_connection.rb

@@ -3,17 +3,26 @@ module EventMachine
     class ClientConnection < Connection
       def self.start(host, port)
         $server = EM.start_server(host, port, self)
-        puts "Listening on #{host}:#{port}"
-        puts "Send QUIT to quit after waiting for all connections to finish."
-        puts "Send TERM or INT to quit after waiting for up to 10 seconds for connections to finish."
+        LOGGER.info "Listening on #{host}:#{port}"
+        LOGGER.info "Send QUIT to quit after waiting for all connections to finish."
+        LOGGER.info "Send TERM or INT to quit after waiting for up to 10 seconds for connections to finish."
       end
 
       def post_init
+        LOGGER.info "Accepted #{peer}"
         @buffer = []
         @tries = 0
         ProxyMachine.incr
       end
 
+      def peer
+        @peer ||=
+        begin
+          port, ip = Socket.unpack_sockaddr_in(get_peername)
+          "#{ip}:#{port}"
+        end
+      end
+
       def receive_data(data)
         if !@server_side
           @buffer << data
@@ -21,13 +30,14 @@ module EventMachine
         end
       rescue => e
         close_connection
-        puts "#{e.class} - #{e.message}"
+        LOGGER.info "#{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(/^(.+):(.+)$/)
@@ -55,20 +65,18 @@ module EventMachine
       def try_server_connect(host, port)
         @server_side = ServerConnection.request(host, port, self)
         proxy_incoming_to(@server_side, 10240)
-        if @tries > 0
-          puts "Successful connection."
-        end
+        LOGGER.info "Successful connection to #{host}:#{port}."
         true
       rescue => e
         if @tries < 10
           @tries += 1
-          puts "Failed on server connect attempt #{@tries}. Trying again..."
+          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
         else
-          puts "Failed after ten connection attempts."
+          LOGGER.info "Failed after ten connection attempts."
         end
         false
       end

data/lib/proxymachine.rb

@@ -1,14 +1,21 @@
 require 'rubygems'
 require 'eventmachine'
+require 'logger'
 
 require 'proxymachine/client_connection'
 require 'proxymachine/server_connection'
 
+LOGGER = Logger.new(STDOUT)
+
 class ProxyMachine
   MAX_FAST_SHUTDOWN_SECONDS = 10
 
   def self.update_procline
-    $0 = "proxymachine - #{@@name} #{@@listen} - #{self.count} connections"
+    $0 = "proxymachine #{VERSION} - #{@@name} #{@@listen} - #{self.stats} cur/max/tot conns"
+  end
+
+  def self.stats
+    "#{@@counter}/#{@@maxcounter}/#{@@totalcounter}"
   end
 
   def self.count
@@ -16,7 +23,9 @@ class ProxyMachine
   end
 
   def self.incr
+    @@totalcounter += 1
     @@counter += 1
+    @@maxcounter = @@counter if @@counter > @@maxcounter
     self.update_procline
     @@counter
   end
@@ -24,7 +33,7 @@ class ProxyMachine
   def self.decr
     @@counter -= 1
     if $server.nil?
-      puts "Waiting for #{@@counter} connections to finish."
+      LOGGER.info "Waiting for #{@@counter} connections to finish."
     end
     self.update_procline
     EM.stop if $server.nil? and @@counter == 0
@@ -41,17 +50,17 @@ class ProxyMachine
 
   def self.graceful_shutdown(signal)
     EM.stop_server($server) if $server
-    puts "Received #{signal} signal. No longer accepting new connections."
-    puts "Waiting for #{ProxyMachine.count} connections to finish."
+    LOGGER.info "Received #{signal} signal. No longer accepting new connections."
+    LOGGER.info "Waiting for #{ProxyMachine.count} connections to finish."
     $server = nil
     EM.stop if ProxyMachine.count == 0
   end
 
   def self.fast_shutdown(signal)
     EM.stop_server($server) if $server
-    puts "Received #{signal} signal. No longer accepting new connections."
-    puts "Maximum time to wait for connections is #{MAX_FAST_SHUTDOWN_SECONDS} seconds."
-    puts "Waiting for #{ProxyMachine.count} connections to finish."
+    LOGGER.info "Received #{signal} signal. No longer accepting new connections."
+    LOGGER.info "Maximum time to wait for connections is #{MAX_FAST_SHUTDOWN_SECONDS} seconds."
+    LOGGER.info "Waiting for #{ProxyMachine.count} connections to finish."
     $server = nil
     EM.stop if ProxyMachine.count == 0
     Thread.new do
@@ -61,6 +70,8 @@ class ProxyMachine
   end
 
   def self.run(name, host, port)
+    @@totalcounter = 0
+    @@maxcounter = 0
     @@counter = 0
     @@name = name
     @@listen = "#{host}:#{port}"
@@ -80,6 +91,15 @@ 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

data/proxymachine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{proxymachine}
-  s.version = "0.2.7"
+  s.version = "0.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2009-10-12}
+  s.date = %q{2009-10-14}
   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: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-12 00:00:00 -07:00
+date: 2009-10-14 00:00:00 -07:00
 default_executable: proxymachine
 dependencies: 
 - !ruby/object:Gem::Dependency