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 sure the logger gets passed to the gateway, and log the server.host, instead of the server record

Browse source 
git-svn-id: http://svn.rubyonrails.org/rails/tools/capistrano@6269 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jamis Buck 2007-02-28 19:22:51 +00:00
parent 3d1bdb06bf
commit 46ef78d2d8
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/capistrano/configuration/connections.rb
View file

@ -52,7 +52,7 @@ module Capistrano
if exists?(:gateway) if exists?(:gateway)
logger.debug "establishing connection to gateway `#{fetch(:gateway)}'" logger.debug "establishing connection to gateway `#{fetch(:gateway)}'"
Gateway.new(ServerDefinition.new(fetch(:gateway)), options) Gateway.new(ServerDefinition.new(fetch(:gateway)), options.merge(:logger => logger))
else else
DefaultConnectionFactory.new(options) DefaultConnectionFactory.new(options)
end end

2
lib/capistrano/gateway.rb
View file

@ -75,7 +75,7 @@ module Capistrano
# Net::SSH connection via that port. # Net::SSH connection via that port.
def connect_to(server) def connect_to(server)
connection = nil connection = nil
logger.trace "establishing connection to #{server} via gateway" if logger logger.trace "establishing connection to `#{server.host}' via gateway" if logger
local_port = next_port local_port = next_port
thread = Thread.new do thread = Thread.new do

2
test/configuration/connections_test.rb
View file

@ -65,7 +65,7 @@ class ConfigurationConnectionsTest < Test::Unit::TestCase
def test_connection_factory_as_gateway_should_honor_config_options def test_connection_factory_as_gateway_should_honor_config_options
@config.values[:gateway] = "capistrano" @config.values[:gateway] = "capistrano"
@config.values.update(@ssh_options) @config.values.update(@ssh_options)
Capistrano::SSH.expects(:connect).with { |s,opts| s.host == "capistrano" && opts == @ssh_options }.yields(stub_everything) Capistrano::SSH.expects(:connect).with { |s,opts| s.host == "capistrano" && opts == @ssh_options.merge(:logger => @config.logger) }.yields(stub_everything)
assert_instance_of Capistrano::Gateway, @config.connection_factory assert_instance_of Capistrano::Gateway, @config.connection_factory
end end