Browse files

Revert "Verbose command execution log should be optional. Set :verbos…

…e_command_log to true when you need it. Refs #178."

This reverts commit e9ba06f.
  • Loading branch information...
1 parent 830b353 commit ef5f83f63bdcd6696565c4445c7b9950e39feb11 @leehambley leehambley committed Apr 13, 2012
Showing with 3 additions and 7 deletions.
  1. +1 −1 lib/capistrano/command.rb
  2. +1 −5 lib/capistrano/configuration/actions/invocation.rb
  3. +1 −1 test/configuration_test.rb
View
2 lib/capistrano/command.rb
@@ -219,7 +219,7 @@ def open_channels
command_line = [environment, shell, cmd].compact.join(" ")
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.send_data(options[:data]) if options[:data]
View
6 lib/capistrano/configuration/actions/invocation.rb
@@ -175,11 +175,7 @@ def run_tree(tree, options={}) #:nodoc:
execute_on_servers(options) do |servers|
targets = servers.map { |s| sessions[s] }
- Command.process(tree, targets, options.merge(
- :logger => logger,
- :verbose_command_log => fetch(:verbose_command_log, false)
- )
- )
+ Command.process(tree, targets, options.merge(:logger => logger))
end
end
View
2 test/configuration_test.rb
@@ -16,7 +16,7 @@ def test_connections_execution_loading_namespaces_roles_and_variables_modules_sh
process_args = Proc.new do |tree, session, opts|
tree.fallback.command == "echo 'hello world'" &&
session == [:session] &&
- opts == { :logger => @config.logger, :verbose_command_log => false }
+ opts == { :logger => @config.logger }
end
Capistrano::Command.expects(:process).with(&process_args)

0 comments on commit ef5f83f

Please sign in to comment.