fizx-proxymachine 1.5.1 → 1.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
13
13
  ## If your rubyforge_project name is different, then edit it and comment out
14
14
  ## the sub! line in the Rakefile
15
15
  s.name = 'fizx-proxymachine'
16
- s.version = '1.5.1'
16
+ s.version = '1.5.2'
17
17
  s.date = '2011-05-07'
18
18
  s.rubyforge_project = 'fizx-proxymachine'
19
19
 
data/lib/proxymachine.rb CHANGED
@@ -10,7 +10,7 @@ require 'proxymachine/callback_server_connection'
10
10
  $logger = Logger.new(STDOUT)
11
11
 
12
12
  class ProxyMachine
13
- VERSION = '1.2.4'
13
+ VERSION = '1.5.2'
14
14
 
15
15
  MAX_FAST_SHUTDOWN_SECONDS = 10
16
16
 
@@ -19,9 +19,5 @@ class ProxyMachine
19
19
  rescue => e
20
20
  $logger.info e.message + e.backtrace.join("\n")
21
21
  end
22
-
23
- def unbind
24
- @client_side.close_connection_after_writing
25
- end
26
22
  end
27
23
  end
@@ -76,7 +76,7 @@ class ProxyMachine
76
76
  def connect_to_server
77
77
  fail "connect_server called without remote established" if @remote.nil?
78
78
  host, port = @remote
79
- $logger.info "Establishing new connection with #{host}:#{port}"
79
+ $logger.info "Establishing new connection with #{host}:#{port} OHAI"
80
80
  cb = @commands[:callback]
81
81
  klass = cb ? CallbackServerConnection : ServerConnection
82
82
  @server_side = klass.request(host, port, self)
@@ -107,7 +107,7 @@ class ProxyMachine
107
107
  $logger.error "Connection with #{@remote.join(':')} was terminated prematurely."
108
108
  close_connection
109
109
  (@connect_error_callback || ProxyMachine.connect_error_callback).call(@remote.join(':'))
110
- elsif @tries < 10
110
+ elsif @tries < 2
111
111
  @tries += 1
112
112
  $logger.warn "Retrying connection with #{@remote.join(':')} (##{@tries})"
113
113
  EM.add_timer(0.1) { connect_to_server }
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: fizx-proxymachine
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 1.5.1
5
+ version: 1.5.2
6
6
  platform: ruby
7
7
  authors:
8
8
  - Tom Preston-Werner