diff options
author | Thom May <thom@chef.io> | 2015-11-09 14:59:01 +0000 |
---|---|---|
committer | Thom May <thom@chef.io> | 2015-11-09 15:04:04 +0000 |
commit | db8cda192518f7d3658573cb7974eb8a6e3dd6d1 (patch) | |
tree | 73ee6f11c120e0f15c7c2be1fd311725f9ad40b6 /chef-config | |
parent | 28487132e3d5469c07cbe790fb46edfd555d1c12 (diff) | |
download | chef-db8cda192518f7d3658573cb7974eb8a6e3dd6d1.tar.gz |
respond to review comments
the logic is now:
if the resource is not sensitive, and if it's explicitly requested to be
streamed or if the log level is info or debug, then we'll consider
streaming it.
If we're configured to send the output to the events stream, we'll do
so.
Otherwise, if we're not daemonized and have a TTY, we'll go to STDOUT
Diffstat (limited to 'chef-config')
-rw-r--r-- | chef-config/lib/chef-config/config.rb | 4 | ||||
-rw-r--r-- | chef-config/spec/unit/config_spec.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chef-config/lib/chef-config/config.rb b/chef-config/lib/chef-config/config.rb index 6a028e9564..4e9355192a 100644 --- a/chef-config/lib/chef-config/config.rb +++ b/chef-config/lib/chef-config/config.rb @@ -271,8 +271,8 @@ module ChefConfig # Using `force_logger` causes chef to default to logger output when STDOUT is a tty default :force_logger, false - # Using 'always_stream_output' will have Chef always stream the execute output - default :always_stream_output, false + # Using 'stream_execute_output' will have Chef always stream the execute output + default :stream_execute_output, false default :http_retry_count, 5 default :http_retry_delay, 5 diff --git a/chef-config/spec/unit/config_spec.rb b/chef-config/spec/unit/config_spec.rb index fc8528ad46..8e9a499a1a 100644 --- a/chef-config/spec/unit/config_spec.rb +++ b/chef-config/spec/unit/config_spec.rb @@ -264,8 +264,8 @@ RSpec.describe ChefConfig::Config do end end - it "ChefConfig::Config[:always_stream_output] defaults to false" do - expect(ChefConfig::Config[:always_stream_output]).to eq(false) + it "ChefConfig::Config[:stream_execute_output] defaults to false" do + expect(ChefConfig::Config[:stream_execute_output]).to eq(false) end it "ChefConfig::Config[:file_backup_path] defaults to /var/chef/backup" do |