summaryrefslogtreecommitdiff
path: root/lib/chef/client.rb
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2015-03-16 11:57:44 -0700
committerBryan McLellan <btm@chef.io>2015-03-17 09:10:04 -0400
commit625373d40febafa1c6621aaf179852601d303e6c (patch)
tree249ba5a901a71cd889764d1f58fac913d042217c /lib/chef/client.rb
parent576b45348fd975f1ded026ed45c6d83967e1a85c (diff)
downloadchef-625373d40febafa1c6621aaf179852601d303e6c.tar.gz
We should not change how exceptions are raised if audit mode is disabled
Diffstat (limited to 'lib/chef/client.rb')
-rw-r--r--lib/chef/client.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/chef/client.rb b/lib/chef/client.rb
index 7fd7bd9e3f..f5cde4bfb3 100644
--- a/lib/chef/client.rb
+++ b/lib/chef/client.rb
@@ -331,8 +331,8 @@ class Chef
runner.converge
@events.converge_complete
rescue Exception => e
- Chef::Log.error("Converge failed with error message #{e.message}")
@events.converge_failed(e)
+ raise e if Chef::Config[:audit_mode] == :disabled
converge_exception = e
end
end
@@ -347,6 +347,7 @@ class Chef
begin
save_updated_node
rescue Exception => e
+ raise e if Chef::Config[:audit_mode] == :disabled
converge_exception = e
end
end