diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/chef/event_dispatch/base.rb | 4 | ||||
| -rw-r--r-- | lib/chef/formatters/base.rb | 4 | ||||
| -rw-r--r-- | lib/chef/run_context/cookbook_compiler.rb | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/lib/chef/event_dispatch/base.rb b/lib/chef/event_dispatch/base.rb index 6c6b2fa3bb..04c960c7af 100644 --- a/lib/chef/event_dispatch/base.rb +++ b/lib/chef/event_dispatch/base.rb @@ -232,11 +232,11 @@ class Chef end # Called after the recipe has been loaded - def recipe_file_loaded(path) + def recipe_file_loaded(path, recipe) end # Called after a recipe file fails to load - def recipe_file_load_failed(path, exception) + def recipe_file_load_failed(path, exception, recipe) end # Called when a recipe cannot be resolved diff --git a/lib/chef/formatters/base.rb b/lib/chef/formatters/base.rb index 3641e619e9..536bf72e02 100644 --- a/lib/chef/formatters/base.rb +++ b/lib/chef/formatters/base.rb @@ -203,12 +203,12 @@ class Chef end # Delegates to #file_loaded - def recipe_file_loaded(path) + def recipe_file_loaded(path, recipe) file_loaded(path) end # Delegates to #file_load_failed - def recipe_file_load_failed(path, exception) + def recipe_file_load_failed(path, exception, recipe) file_load_failed(path, exception) end diff --git a/lib/chef/run_context/cookbook_compiler.rb b/lib/chef/run_context/cookbook_compiler.rb index bdf3a1251c..b2a8d236a3 100644 --- a/lib/chef/run_context/cookbook_compiler.rb +++ b/lib/chef/run_context/cookbook_compiler.rb @@ -137,13 +137,14 @@ class Chef @events.recipe_load_start(run_list_expansion.recipes.size) run_list_expansion.recipes.each do |recipe| begin + path = resolve_recipe(recipe) @run_context.load_recipe(recipe) + @events.recipe_file_loaded(path, recipe) rescue Chef::Exceptions::RecipeNotFound => e @events.recipe_not_found(e) raise rescue Exception => e - path = resolve_recipe(recipe) - @events.recipe_file_load_failed(path, e) + @events.recipe_file_load_failed(path, e, recipe) raise end end |