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

Merge pull request #30436 from jirikotlin/develop

Browse Source 
Exception when analysed process is turned off during execution.
This commit is contained in:
Mike Place 2016-01-19 07:42:33 -07:00
commit add9bf1fd9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/modules/restartcheck.py
View File

@ -368,7 +368,11 @@ def restartcheck(ignorelist=None, blacklist=None, excludepid=None, verbose=True)
name, pid, path = deleted_file[0], deleted_file[1], deleted_file[2]
if path in blacklist or pid in excludepid:
continue
readlink = os.readlink('/proc/{0}/exe'.format(pid))
try:
readlink = os.readlink('/proc/{0}/exe'.format(pid))
except OSError:
excludepid.append(pid)
continue
try:
packagename = owners_cache[readlink]
except KeyError: