Merge pull request #13565 from cachedout/13533

Fix reversed params.
2024-11-07 00:55:19 +00:00 · 2014-06-19 09:58:40 -06:00 · 2014-06-19 09:58:40 -06:00 · 11224456eb
commit 11224456eb
parent 6986efe738 ed523cd44d
1 changed files with 1 additions and 1 deletions
--- a/salt/master.py
+++ b/salt/master.py
@ -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()