Merge pull request #42920 from cachedout/pid_race

pid_race
2024-11-07 17:09:03 +00:00 · 2017-08-14 21:49:09 -06:00 · 2017-08-14 21:49:09 -06:00 · a1817f1de3
commit a1817f1de3
parent 11a33fe692 5e930b8cbd
1 changed files with 4 additions and 2 deletions
--- a/salt/utils/process.py
+++ b/salt/utils/process.py
@ -130,8 +130,10 @@ def get_pidfile(pidfile):
    '''
    with salt.utils.fopen(pidfile) as pdf:
        pid = pdf.read()
-
+    if pid:
        return int(pid)
+    else:
+        return


 def clean_proc(proc, wait_for_kill=10):