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

Merge pull request #42920 from cachedout/pid_race

Browse Source 
pid_race
This commit is contained in:
Mike Place 2017-08-14 21:49:09 -06:00 committed by GitHub
commit a1817f1de3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/utils/process.py
View File

@ -130,8 +130,10 @@ def get_pidfile(pidfile):
'''
with salt.utils.fopen(pidfile) as pdf:
pid = pdf.read()
return int(pid)
if pid:
return int(pid)
else:
return
def clean_proc(proc, wait_for_kill=10):