Make configuration errors more informative

1 files changed, 4 insertions, 3 deletions

diff --git a/lib/chef/application.rb b/lib/chef/application.rb
index d6c3a028f5..9be238604e 100644
--- a/lib/chef/application.rb
+++ b/lib/chef/application.rb
@@ -217,10 +217,11 @@ class Chef::Application
 
   def apply_config(config_content, config_file_path)
     Chef::Config.from_string(config_content, config_file_path)
-  rescue Chef::Exceptions::ConfigurationError => error
-    Chef::Application.fatal!("Error processing config file #{config_file_path} with error #{error.message}", 2)
   rescue Exception => error
-    Chef::Application.fatal!("Unknown error processing config file #{config_file_path} with error #{error.message}", 2)
+    Chef::Log.fatal("Configuration error #{error.class}: #{error.message}")
+    filtered_trace = error.backtrace.grep(/#{Regexp.escape(config_file_path)}/)
+    filtered_trace.each {|line| Chef::Log.fatal("  " + line + "\n")}
+    Chef::Application.fatal!("Aborting due to error in '#{config_file_path}'", 2)
   end
 
   class << self