tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

puppet: Fixed puppet-check for Puppet 3

Browse source
This commit is contained in:
Ossi Salmi 2013-05-04 21:24:15 +03:00
parent d7ff4cafbc
commit 0a4ac9874a
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
puppet/files/puppet-check
View file

@ -44,7 +44,11 @@ begin
end end
# check if deadlock file is too old # check if deadlock file is too old
dlock = Puppet.settings.value("puppetdlockfile") if Puppet.version[/\d+/].to_i >= 3
dlock = Puppet.settings.value("agent_disabled_lockfile")
else
dlock = Puppet.settings.value("puppetdlockfile")
end
if File.exists?(dlock) and Time.new - File.new(dlock).mtime > 43200 if File.exists?(dlock) and Time.new - File.new(dlock).mtime > 43200
err = "puppetd deadlock file is over 12 hours old, removing it and sending HUP to daemon\n" err = "puppetd deadlock file is over 12 hours old, removing it and sending HUP to daemon\n"
Syslog.warning err Syslog.warning err