diff options
| author | Tim Watson <tim@rabbitmq.com> | 2012-05-16 16:26:27 +0100 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2012-05-16 16:26:27 +0100 |
| commit | 484fb54209baaaeba7b05a701cc0701f0612811d (patch) | |
| tree | 49912fa6e2dbb179959161043c727941b8841a80 | |
| parent | b928966c4beb3a5c77ddda202fe5b0b55ba45281 (diff) | |
| download | rabbitmq-server-484fb54209baaaeba7b05a701cc0701f0612811d.tar.gz | |
be mindful of windows line endings whilst parsing pid files
| -rw-r--r-- | src/rabbit_control_main.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index b1c120bd..2878e8e2 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -405,6 +405,8 @@ wait_for_application(Node, PidFile, Application, Inform) -> Inform("pid is ~s", [Pid]), wait_for_application(Node, Pid, Application). +wait_for_application(Node, Pid, rabbit) -> + wait_for_startup(Node, Pid); wait_for_application(Node, Pid, Application) -> while_process_is_alive(Node, Pid, fun() -> rabbit_nodes:is_running(Node, Application) end). @@ -433,7 +435,7 @@ wait_for_process_death(Pid) -> read_pid_file(PidFile, Wait) -> case {file:read_file(PidFile), Wait} of {{ok, Bin}, _} -> - S = string:strip(binary_to_list(Bin), right, $\n), + S = re:replace(Bin, "\\s", "", [global, {return, list}]), try list_to_integer(S) catch error:badarg -> exit({error, {garbage_in_pid_file, PidFile}}) |