Skip to content

Commit

Permalink
Revert "Verbose command execution log should be optional. Set :verbos…
Browse files Browse the repository at this point in the history
…e_command_log to true when you need it. Refs #178."

This reverts commit e9ba06f.
  • Loading branch information
leehambley committed Apr 13, 2012
1 parent 830b353 commit ef5f83f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion lib/capistrano/command.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ def open_channels
command_line = [environment, shell, cmd].compact.join(" ") command_line = [environment, shell, cmd].compact.join(" ")
ch[:command] = command_line ch[:command] = command_line


logger.trace command_line, ch[:server] if logger && options[:verbose_command_log] logger.trace command_line, ch[:server] if logger


ch.exec(command_line) ch.exec(command_line)
ch.send_data(options[:data]) if options[:data] ch.send_data(options[:data]) if options[:data]
Expand Down
6 changes: 1 addition & 5 deletions lib/capistrano/configuration/actions/invocation.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -175,11 +175,7 @@ def run_tree(tree, options={}) #:nodoc:


execute_on_servers(options) do |servers| execute_on_servers(options) do |servers|
targets = servers.map { |s| sessions[s] } targets = servers.map { |s| sessions[s] }
Command.process(tree, targets, options.merge( Command.process(tree, targets, options.merge(:logger => logger))
:logger => logger,
:verbose_command_log => fetch(:verbose_command_log, false)
)
)
end end
end end


Expand Down
2 changes: 1 addition & 1 deletion test/configuration_test.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def test_connections_execution_loading_namespaces_roles_and_variables_modules_sh
process_args = Proc.new do |tree, session, opts| process_args = Proc.new do |tree, session, opts|
tree.fallback.command == "echo 'hello world'" && tree.fallback.command == "echo 'hello world'" &&
session == [:session] && session == [:session] &&
opts == { :logger => @config.logger, :verbose_command_log => false } opts == { :logger => @config.logger }
end end


Capistrano::Command.expects(:process).with(&process_args) Capistrano::Command.expects(:process).with(&process_args)
Expand Down

0 comments on commit ef5f83f

Please sign in to comment.