summaryrefslogtreecommitdiff
path: root/lib/chef
diff options
context:
space:
mode:
authorJoshua Miller <joshuamiller01@gmail.com>2019-01-09 18:11:45 -0800
committerPhil Dibowitz <phil@ipom.com>2019-01-09 18:11:45 -0800
commit095474cf0bc7d792237605b9007afa67d14c3f27 (patch)
tree360d3e4bf1578d1ed9453896eebcd549c636e9fb /lib/chef
parentcab850895efbeeb2f054abebd559d68ea00a456e (diff)
downloadchef-095474cf0bc7d792237605b9007afa67d14c3f27.tar.gz
Don't system exit on ohai CriticalPluginFailure (#8098)
Signed-off-by: Joshua Miller <joshmiller@fb.com>
Diffstat (limited to 'lib/chef')
-rw-r--r--lib/chef/client.rb3
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/chef/client.rb b/lib/chef/client.rb
index 15922a5efd..3347536c12 100644
--- a/lib/chef/client.rb
+++ b/lib/chef/client.rb
@@ -607,9 +607,6 @@ class Chef
filter = Chef::Config[:minimal_ohai] ? %w{fqdn machinename hostname platform platform_version ohai_time os os_version init_package} : nil
ohai.all_plugins(filter)
events.ohai_completed(node)
- rescue Ohai::Exceptions::CriticalPluginFailure => e
- logger.error("Critical Ohai plugins failed: #{e.message}")
- exit(false)
end
#