summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2011-07-20 16:15:20 +0100
committerSimon MacMullen <simon@rabbitmq.com>2011-07-20 16:15:20 +0100
commite860bf24578762a62776957951def8198dc32d8d (patch)
treec7a102e3886170cc3137fc57d69240c724affc33
parentcbe679daabc853512e61a1305040261b2101afba (diff)
downloadrabbitmq-server-e860bf24578762a62776957951def8198dc32d8d.tar.gz
It *is* a process. It *has* a pid.
-rw-r--r--src/rabbit_control.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index 9581f850..6b9faf9b 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -359,13 +359,13 @@ wait_for_application(Node, PidFile, Inform) ->
wait_for_application(Node, Pid).
wait_for_application(Node, Pid) ->
- case pid_up(Pid) of
+ case process_up(Pid) of
true -> case node_up(Node) of
true -> ok;
false -> timer:sleep(1000),
wait_for_application(Node, Pid)
end;
- false -> {error, pid_not_running}
+ false -> {error, process_not_running}
end.
wait_and_read_pid_file(PidFile) ->
@@ -384,7 +384,7 @@ node_up(Node) ->
% Test using some OS clunkiness since we shouldn't trust
% rpc:call(os, getpid, []) at this point
-pid_up(Pid) ->
+process_up(Pid) ->
with_os([{unix, fun () ->
system("ps -p " ++ Pid
++ " >/dev/null 2>&1") =:= 0