fizx-proxymachine 1.2.0 → 1.3.0

data/VERSION.yml

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

data/bin/proxymachine

@@ -38,8 +38,8 @@ rescue Exception => e
   if e.instance_of?(SystemExit)
     raise
   else
-    LOGGER.info 'Uncaught exception'
-    LOGGER.info e.message
-    LOGGER.info 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)
-    LOGGER.info "Proxying for user #{name}"
+    $logger.info "Proxying for user #{name}"
     "localhost:9418"
   end
 end

data/fizx-proxymachine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fizx-proxymachine}
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   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-10}
+  s.date = %q{2010-01-20}
   s.default_executable = %q{proxymachine}
   s.email = %q{tom@mojombo.com}
   s.executables = ["proxymachine"]

data/lib/proxymachine.rb

@@ -7,7 +7,7 @@ require 'proxymachine/client_connection'
 require 'proxymachine/server_connection'
 require 'proxymachine/callback_server_connection'
 
-LOGGER = Logger.new(STDOUT)
+$logger = Logger.new(STDOUT)
 
 class ProxyMachine
   MAX_FAST_SHUTDOWN_SECONDS = 10
@@ -35,7 +35,7 @@ class ProxyMachine
   def self.decr
     @@counter -= 1
     if $server.nil?
-      LOGGER.info "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
@@ -52,17 +52,17 @@ class ProxyMachine
 
   def self.graceful_shutdown(signal)
     EM.stop_server($server) if $server
-    LOGGER.info "Received #{signal} signal. No longer accepting new connections."
-    LOGGER.info "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
-    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."
+    $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

data/lib/proxymachine/callback_server_connection.rb

@@ -17,7 +17,7 @@ class ProxyMachine
         @client_side.send_data returned
       end
     rescue => e
-      LOGGER.info e.message + e.backtrace.join("\n")
+      $logger.info e.message + e.backtrace.join("\n")
     end
 
     def unbind

data/lib/proxymachine/client_connection.rb

@@ -2,13 +2,13 @@ class ProxyMachine
   class ClientConnection < EventMachine::Connection
     def self.start(host, port)
       $server = EM.start_server(host, port, self)
-      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."
+      $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}"
+      $logger.info "Accepted #{peer}"
       @buffer = []
       @tries = 0
       ProxyMachine.incr
@@ -29,14 +29,14 @@ class ProxyMachine
       end
     rescue => e
       close_connection
-      LOGGER.info "#{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}"
+        $logger.info "#{peer} #{commands.inspect}"
         close_connection unless commands.instance_of?(Hash)
         if remote = commands[:remote]
           m, host, port = *remote.match(/^(.+):(.+)$/)
@@ -70,18 +70,18 @@ class ProxyMachine
     def try_server_connect(host, port, klass)
       @server_side = klass.request(host, port, self)
       proxy_incoming_to(@server_side, 10240)
-      LOGGER.info "Successful connection to #{host}:#{port}."
+      $logger.info "Successful connection to #{host}:#{port}."
       true
     rescue => e
       if @tries < 10
         @tries += 1
-        LOGGER.info "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
-        LOGGER.info "Failed after ten connection attempts."
+        $logger.info "Failed after ten connection attempts."
       end
       false
     end

data/test/configs/simple.rb

@@ -1,4 +1,4 @@
-LOGGER = Logger.new(File.new('/dev/null', 'w'))
+$logger = Logger.new(File.new('/dev/null', 'w'))
 
 callback = proc do |data|
   data + ":callback"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fizx-proxymachine
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-10 00:00:00 -08:00
+date: 2010-01-20 00:00:00 -08:00
 default_executable: proxymachine
 dependencies: 
 - !ruby/object:Gem::Dependency