diff options
| author | mpalmer <mpalmer@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-12-31 05:45:53 +0000 |
|---|---|---|
| committer | mpalmer <mpalmer@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-12-31 05:45:53 +0000 |
| commit | 16f7980ef4d65a89007079f15c04744b5bedfc65 (patch) | |
| tree | ff2bcbb2ce2504c2e7e0ca18cbfa74e53a124806 /lib/puppet/server | |
| parent | e4843f1e5bf177577252a06598c5e84940e719ef (diff) | |
| download | puppet-16f7980ef4d65a89007079f15c04744b5bedfc65.tar.gz puppet-16f7980ef4d65a89007079f15c04744b5bedfc65.tar.xz puppet-16f7980ef4d65a89007079f15c04744b5bedfc65.zip | |
Switch the run-lock to use Pidlock instead of the ad-hoc code
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2002 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/server')
| -rwxr-xr-x | lib/puppet/server/runner.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/server/runner.rb b/lib/puppet/server/runner.rb index 985ed2d3b..46fd7a7ae 100755 --- a/lib/puppet/server/runner.rb +++ b/lib/puppet/server/runner.rb @@ -18,7 +18,7 @@ class Server raise MissingMasterError, "Could not find the master client" end - if master.locked? + if Puppet::Util::Pidlock.new(Puppet[:puppetdlockfile]).locked? Puppet.notice "Could not trigger run; already running" return "running" end |