summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Wragg <david@rabbitmq.com>2010-09-07 20:02:29 +0100
committerDavid Wragg <david@rabbitmq.com>2010-09-07 20:02:29 +0100
commitb7b745cd907284763161e8050ca2cda60312974a (patch)
treee84d1ae694feeead1532ae976314b1652f79eb00
parent56872898a114c270941c8c0c418102f4c6bebf4d (diff)
downloadrabbitmq-server-git-b7b745cd907284763161e8050ca2cda60312974a.tar.gz
Use a more portable command to probe for pids
The ps options used were linux-specific. "kill -0" works on BSDs and OS X too.
-rw-r--r--src/rabbit_multi.erl3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl
index c7a5a60027..9b6ed4b1c2 100644
--- a/src/rabbit_multi.erl
+++ b/src/rabbit_multi.erl
@@ -310,8 +310,7 @@ kill_wait(Pid, TimeLeft, Forceful) ->
is_dead(Pid) ->
PidS = integer_to_list(Pid),
with_os([{unix, fun () ->
- Res = os:cmd("ps --no-headers --pid " ++ PidS),
- Res == ""
+ os:cmd("kill -0 " ++ PidS) /= ""
end},
{win32, fun () ->
Res = os:cmd("tasklist /nh /fi \"pid eq " ++