diff options
author | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-06-15 16:58:25 -0700 |
---|---|---|
committer | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-06-16 09:53:51 -0700 |
commit | c150a684ba337f666f8fde005c952d10babe1a9f (patch) | |
tree | 0949a9f20b16505899583d4a9e1c904235e8dcbc | |
parent | b08c9010c387c762a6fa82fa9ae8c2a5e5c8594d (diff) | |
download | chef-c150a684ba337f666f8fde005c952d10babe1a9f.tar.gz |
Exceptions for audits should only get wrapped if audit mode is enabled
-rw-r--r-- | lib/chef/client.rb | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/lib/chef/client.rb b/lib/chef/client.rb index 86e92585e3..3c86f52b4a 100644 --- a/lib/chef/client.rb +++ b/lib/chef/client.rb @@ -309,12 +309,18 @@ class Chef # with the proper exit status code and everything gets raised # as a RunFailedWrappingError if run_error || converge_error || audit_error - error = if run_error == converge_error - Chef::Exceptions::RunFailedWrappingError.new(converge_error, audit_error) - else - Chef::Exceptions::RunFailedWrappingError.new(run_error, converge_error, audit_error) - end - error.fill_backtrace + error = if Chef::Config[:audit_mode] == :disabled + run_error || converge_error + else + e = if run_error == converge_error + Chef::Exceptions::RunFailedWrappingError.new(converge_error, audit_error) + else + Chef::Exceptions::RunFailedWrappingError.new(run_error, converge_error, audit_error) + end + e.fill_backtrace + e + end + Chef::Application.debug_stacktrace(error) raise error end |