diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-07-20 16:15:20 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-07-20 16:15:20 +0100 |
| commit | 3b459ce77a4be55e205ec1cf0eb827a2e5657bf1 (patch) | |
| tree | c7a102e3886170cc3137fc57d69240c724affc33 | |
| parent | 0f6530bfa5449e53c1d99a0013e4e6b46c886847 (diff) | |
| download | rabbitmq-server-git-3b459ce77a4be55e205ec1cf0eb827a2e5657bf1.tar.gz | |
It *is* a process. It *has* a pid.
| -rw-r--r-- | src/rabbit_control.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index 9581f8506c..6b9faf9bd2 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 |
