valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

correct erroneous os.kill() statement

Browse Source
This commit is contained in:
Marc Fournier 2014-06-02 08:59:04 +02:00
parent 47cfbd40f4
commit c54ee08917
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/puppet.py
View File

@ -269,20 +269,20 @@ def status():
try:
with salt.utils.fopen(puppet.run_lockfile, 'r') as fp_:
pid = int(fp_.read())
os.kill(pid, 0) # raise an OSError if process doesn't exist
except (OSError, ValueError):
return 'Stale lockfile'
else:
os.kill(pid, 0)
return 'Applying a catalog'
if os.path.isfile(puppet.agent_pidfile):
try:
with salt.utils.fopen(puppet.agent_pidfile, 'r') as fp_:
pid = int(fp_.read())
os.kill(pid, 0) # raise an OSError if process doesn't exist
except (OSError, ValueError):
return 'Stale pidfile'
else:
os.kill(pid, 0)
return 'Idle daemon'
return 'Stopped'