diff options
| author | Chris Roberts <chrisroberts.code@gmail.com> | 2012-10-03 13:00:47 -0700 |
|---|---|---|
| committer | Bryan McLellan <btm@opscode.com> | 2012-10-15 14:13:07 -0700 |
| commit | b7aa405bea475de3ccb4342043c40abea569322a (patch) | |
| tree | f99dead05c52a382fb642b5e554afaac2e15af65 | |
| parent | 04bdf7152d0fd88db7281d1675846b82bac66634 (diff) | |
| download | chef-b7aa405bea475de3ccb4342043c40abea569322a.tar.gz | |
Pull chef_client and chef_client_json instance variables up to Chef::Application
| -rw-r--r-- | chef/lib/chef/application.rb | 2 | ||||
| -rw-r--r-- | chef/lib/chef/application/client.rb | 3 | ||||
| -rw-r--r-- | chef/lib/chef/application/solo.rb | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/chef/lib/chef/application.rb b/chef/lib/chef/application.rb index c9c436fa4f..f864996ea5 100644 --- a/chef/lib/chef/application.rb +++ b/chef/lib/chef/application.rb @@ -34,6 +34,8 @@ class Chef::Application def initialize super + @chef_client = nil + @chef_client_json = nil trap("TERM") do Chef::Application.fatal!("SIGTERM received, stopping", 1) end diff --git a/chef/lib/chef/application/client.rb b/chef/lib/chef/application/client.rb index 9d407c87c3..ef40a7a358 100644 --- a/chef/lib/chef/application/client.rb +++ b/chef/lib/chef/application/client.rb @@ -186,9 +186,6 @@ class Chef::Application::Client < Chef::Application def initialize super - - @chef_client = nil - @chef_client_json = nil end # Reconfigure the chef client diff --git a/chef/lib/chef/application/solo.rb b/chef/lib/chef/application/solo.rb index 288729838c..4aca7238f6 100644 --- a/chef/lib/chef/application/solo.rb +++ b/chef/lib/chef/application/solo.rb @@ -149,8 +149,6 @@ class Chef::Application::Solo < Chef::Application def initialize super - @chef_client = nil - @chef_client_json = nil end def reconfigure |