diff options
| author | Tim Smith <tsmith@chef.io> | 2019-04-19 15:31:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-19 15:31:45 -0700 |
| commit | 0672865c4e728c7a7b671a04e9571f7debb0634e (patch) | |
| tree | 44ec511d57d3c9254c1641ff34d7b978f2f0073a /lib | |
| parent | bb9b9ed57b7b6999eb68ebb5cab259206ed9e542 (diff) | |
| parent | 62b4b5ccb2d80cabf7b358151613aaf74620197a (diff) | |
| download | chef-0672865c4e728c7a7b671a04e9571f7debb0634e.tar.gz | |
Merge pull request #8402 from chef/sync_with_chef_14
Sync the CLI option descriptions between chef-client and chef-solo
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/chef/application/solo.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb index 28308ce763..26b311e78a 100644 --- a/lib/chef/application/solo.rb +++ b/lib/chef/application/solo.rb @@ -81,13 +81,13 @@ class Chef::Application::Solo < Chef::Application option :log_level, short: "-l LEVEL", long: "--log_level LEVEL", - description: "Set the log level (trace, debug, info, warn, error, fatal)", + description: "Set the log level (auto, trace, debug, info, warn, error, fatal)", proc: lambda { |l| l.to_sym } option :log_location, short: "-L LOGLOCATION", long: "--logfile LOGLOCATION", - description: "Set the log file location, defaults to STDOUT", + description: "Set the log file location, defaults to STDOUT - recommended for daemonizing", proc: nil option :help, @@ -121,7 +121,7 @@ class Chef::Application::Solo < Chef::Application option :lockfile, long: "--lockfile LOCKFILE", - description: "Set the lockfile location. Prevents multiple processes from converging at the same time", + description: "Set the lockfile location. Prevents multiple solo processes from converging at the same time", proc: nil option :interval, @@ -164,7 +164,7 @@ class Chef::Application::Solo < Chef::Application option :override_runlist, short: "-o RunlistItem,RunlistItem...", long: "--override-runlist RunlistItem,RunlistItem...", - description: "Replace current run list with specified items", + description: "Replace current run list with specified items for a single run", proc: lambda { |items| items = items.split(",") items.compact.map do |item| @@ -304,8 +304,8 @@ class Chef::Application::Solo < Chef::Application def run_application if !Chef::Config[:client_fork] || Chef::Config[:once] - # Run immediately without interval sleep or splay begin + # run immediately without interval sleep, or splay run_chef_client(Chef::Config[:specific_recipes]) rescue SystemExit raise |