Skip to content
Browse files

Revert "Add host information to more logging places."

This reverts commit e76ac3d.
  • Loading branch information...
1 parent ef5f83f commit c18565912e33108176050c0dead699ca79a2bb8c @leehambley leehambley committed Apr 13, 2012
Showing with 3 additions and 5 deletions.
  1. +0 −2 lib/capistrano/command.rb
  2. +3 −3 lib/capistrano/transfer.rb
View
2 lib/capistrano/command.rb
@@ -219,8 +219,6 @@ def open_channels
command_line = [environment, shell, cmd].compact.join(" ")
ch[:command] = command_line
- logger.trace command_line, ch[:server] if logger
-
ch.exec(command_line)
ch.send_data(options[:data]) if options[:data]
else
View
6 lib/capistrano/transfer.rb
@@ -117,7 +117,7 @@ def prepare_transfers
def prepare_scp_transfer(from, to, session)
real_callback = callback || Proc.new do |channel, name, sent, total|
- logger.trace "#{transport} #{operation} #{from} -> #{to}", channel[:host] if logger && sent == 0
+ logger.trace "[#{channel[:host]}] #{name}" if logger && sent == 0
end
channel = case direction
@@ -167,9 +167,9 @@ def prepare_sftp_transfer(from, to, session)
if callback
callback.call(event, op, *args)
elsif event == :open
- logger.trace "#{transport} #{operation} #{from} -> #{to}", op[:host]
+ logger.trace "[#{op[:host]}] #{args[0].remote}"
elsif event == :finish
- logger.trace "#{transport} #{operation} #{from} -> #{to} done", op[:host]
+ logger.trace "[#{op[:host]}] done"
end
end

0 comments on commit c185659

Please sign in to comment.
Something went wrong with that request. Please try again.