summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Shpakov <igorshp@gmail.com>2015-04-09 11:11:47 +0100
committerIgor Shpakov <igorshp@gmail.com>2015-04-09 11:29:20 +0100
commit8f971a1c5e7a1095798aee6874aecc42047d37ab (patch)
tree0c6903ed6f80f79ce48fc42dd97db549370a0908
parent648c9f91d4a0ccbcf661a5ee4d3ec67d8538a5f3 (diff)
downloadchef-8f971a1c5e7a1095798aee6874aecc42047d37ab.tar.gz
patch to always run exception handlers
exception handlers require @run_status to be set. This patch moves @run_status declaration higher up so exception handlers report on all problems inside do_run begin block
-rw-r--r--lib/chef/client.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/client.rb b/lib/chef/client.rb
index a4f15c271f..f172bb1a97 100644
--- a/lib/chef/client.rb
+++ b/lib/chef/client.rb
@@ -152,7 +152,6 @@ class Chef
def initialize(json_attribs=nil, args={})
@json_attribs = json_attribs || {}
@node = nil
- @run_status = nil
@runner = nil
@ohai = Ohai::System.new
@@ -162,6 +161,7 @@ class Chef
@events = EventDispatch::Dispatcher.new(*event_handlers)
@override_runlist = args.delete(:override_runlist)
@specific_recipes = args.delete(:specific_recipes)
+ @run_status = Chef::RunStatus.new(node, events)
if new_runlist = args.delete(:runlist)
@json_attribs["run_list"] = new_runlist