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

salt/utils/process.py: fix order of args to os.kill()

Browse Source 
Fixes: #15269
Signed-off-by: Dan Mick <dan.mick@inktank.com>
This commit is contained in:
Dan Mick 2014-08-25 16:25:32 -07:00 committed by Colton Myers
parent 9acf13bf39
commit 1c4c63428b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/utils/process.py
View File

@ -89,7 +89,7 @@ def clean_proc(proc, wait_for_kill=10):
proc.pid
)
)
os.kill(signal.SIGKILL, proc.pid)
os.kill(proc.pid, signal.SIGKILL)
except (AssertionError, AttributeError):
# Catch AssertionError when the proc is evaluated inside the child
# Catch AttributeError when the process dies between proc.is_alive()