summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2015-10-13 09:33:44 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2015-10-13 09:33:44 -0700
commit51c6ba84a3f189398b01de10d031dec5b16d9e8c (patch)
treec2f409f0ee1867c2e64205147ec19c5b031c9ddd
parent343cb04b63cbf3ecb5010b8873c241ed41806a5c (diff)
downloadchef-lcg/ruby-profiling.tar.gz
fix PR feedbacklcg/ruby-profiling
-rw-r--r--lib/chef/application/apply.rb2
-rw-r--r--lib/chef/application/solo.rb2
-rw-r--r--lib/chef/client.rb8
3 files changed, 5 insertions, 7 deletions
diff --git a/lib/chef/application/apply.rb b/lib/chef/application/apply.rb
index 69129a4691..565b5e055c 100644
--- a/lib/chef/application/apply.rb
+++ b/lib/chef/application/apply.rb
@@ -99,7 +99,7 @@ class Chef::Application::Apply < Chef::Application
option :profile_ruby,
:long => "--[no-]profile-ruby",
- :description => "Output ruby execution profile graph",
+ :description => "Dump complete Ruby call graph stack of entire Chef run (expert only)",
:boolean => true,
:default => false
diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb
index 1fcc819068..4b472e9662 100644
--- a/lib/chef/application/solo.rb
+++ b/lib/chef/application/solo.rb
@@ -54,7 +54,7 @@ class Chef::Application::Solo < Chef::Application
option :profile_ruby,
:long => "--[no-]profile-ruby",
- :description => "Output ruby execution profile graph",
+ :description => "Dump complete Ruby call graph stack of entire Chef run (expert only)",
:boolean => true,
:default => false
diff --git a/lib/chef/client.rb b/lib/chef/client.rb
index cc3fe4fd5c..e2d76092e2 100644
--- a/lib/chef/client.rb
+++ b/lib/chef/client.rb
@@ -897,11 +897,9 @@ class Chef
attr_reader :specific_recipes
def profiling_prereqs!
- begin
- require 'ruby-prof'
- rescue LoadError
- raise "You must have the ruby-prof gem installed in order to use --profile-ruby"
- end
+ require 'ruby-prof'
+ rescue LoadError
+ raise "You must have the ruby-prof gem installed in order to use --profile-ruby"
end
def start_profiling