diff --git a/puppet/files/puppet-check b/puppet/files/puppet-check index 5518d6e..73535f8 100755 --- a/puppet/files/puppet-check +++ b/puppet/files/puppet-check @@ -44,7 +44,11 @@ begin end # 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 err = "puppetd deadlock file is over 12 hours old, removing it and sending HUP to daemon\n" Syslog.warning err