diff options
| author | Rob Redpath <rob.redpath@wwwh.com> | 2014-11-12 09:53:42 +0000 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2015-01-25 10:55:53 -0800 |
| commit | aa072a9c2f8883ea939bab9478eb3f048e187161 (patch) | |
| tree | c58ea51827d3ccb95e4d0c3ef9aab78a9e147cc2 /lib/chef/application | |
| parent | d8e4e7ddd68ee6eb28265813e5241edff555e90d (diff) | |
| download | chef-aa072a9c2f8883ea939bab9478eb3f048e187161.tar.gz | |
Set lockfile, not pidfile
Diffstat (limited to 'lib/chef/application')
| -rw-r--r-- | lib/chef/application/client.rb | 9 | ||||
| -rw-r--r-- | lib/chef/application/solo.rb | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb index e71f1fa92c..49e3c1452e 100644 --- a/lib/chef/application/client.rb +++ b/lib/chef/application/client.rb @@ -101,10 +101,15 @@ class Chef::Application::Client < Chef::Application :proc => lambda { |p| true } end - option :lockfile, + option :pid_file, :short => "-P PID_FILE", :long => "--pid PIDFILE", - :description => "Set the PID file location, defaults to /tmp/chef-client.pid", + :description => "Set the PID file location, for when chef-client is running as a daemon. Defaults to /tmp/chef-client.pid", + :proc => nil + + option :lockfile, + :long => "--lockfile LOCKFILE", + :description => "Set the lockfile location", :proc => nil option :interval, diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb index c3f5444ef7..e930afa48a 100644 --- a/lib/chef/application/solo.rb +++ b/lib/chef/application/solo.rb @@ -99,6 +99,11 @@ class Chef::Application::Solo < Chef::Application :proc => lambda { |p| true } end + option :lockfile, + :long => "--lockfile LOCKFILE", + :description => "Set the lockfile location", + :proc => nil + option :interval, :short => "-i SECONDS", :long => "--interval SECONDS", |