kotovalexarian-likes-github/capistrano
1
0
Fork 0
mirror of https://github.com/capistrano/capistrano synced 2023-03-27 23:21:18 -04:00
Code Releases Activity

Make port selection smarter for gateway connections

Browse source 
git-svn-id: http://svn.rubyonrails.org/rails/tools/switchtower@3608 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jamis Buck 2006-02-19 01:27:20 +00:00
parent e4f56866aa
commit 17ec994638
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -1,5 +1,7 @@
*0.11.0* *SVN* *0.11.0* *SVN*
* Make port selection smarter for gateway connections
* Add extension mechanism for custom ST operations * Add extension mechanism for custom ST operations
* Make ST rails rake tasks more configurable * Make ST rails rake tasks more configurable

18
lib/switchtower/gateway.rb
View file

@ -25,11 +25,14 @@ module SwitchTower
# The Net::SSH session representing the gateway connection. # The Net::SSH session representing the gateway connection.
attr_reader :session attr_reader :session
MAX_PORT = 65535
MIN_PORT = 1024
def initialize(server, config) #:nodoc: def initialize(server, config) #:nodoc:
@config = config @config = config
@pending_forward_requests = {} @pending_forward_requests = {}
@mutex = Mutex.new @mutex = Mutex.new
@next_port = 31310 @next_port = MAX_PORT
@terminate_thread = false @terminate_thread = false
waiter = ConditionVariable.new waiter = ConditionVariable.new
@ -79,6 +82,13 @@ module SwitchTower
private private
def next_port
port = @next_port
@next_port -= 1
@next_port = MAX_PORT if @next_port < MIN_PORT
port
end
def process_next_pending_connection_request def process_next_pending_connection_request
@mutex.synchronize do @mutex.synchronize do
key = @pending_forward_requests.keys.detect { |k| ConditionVariable === @pending_forward_requests[k] } or return key = @pending_forward_requests.keys.detect { |k| ConditionVariable === @pending_forward_requests[k] } or return
@ -86,14 +96,16 @@ module SwitchTower
@config.logger.trace "establishing connection to #{key} via gateway" @config.logger.trace "establishing connection to #{key} via gateway"
port = @next_port port = next_port
@next_port += 1
begin begin
@session.forward.local(port, key, 22) @session.forward.local(port, key, 22)
@pending_forward_requests[key] = SSH.connect('127.0.0.1', @config, @pending_forward_requests[key] = SSH.connect('127.0.0.1', @config,
port) port)
@config.logger.trace "connection to #{key} via gateway established" @config.logger.trace "connection to #{key} via gateway established"
rescue Errno::EADDRINUSE
port = next_port
retry
rescue Object rescue Object
@pending_forward_requests[key] = nil @pending_forward_requests[key] = nil
raise raise