diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-06-06 12:32:59 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-06-06 12:32:59 +0100 |
| commit | 5e79bf36a7b08d88467c5010eea7d865a32404c9 (patch) | |
| tree | cd6599e0b035a941eccd5f105582ebf7e4d2150d | |
| parent | 34ad79c65a66af83c5b016ef4423599354bb501c (diff) | |
| download | rabbitmq-server-git-5e79bf36a7b08d88467c5010eea7d865a32404c9.tar.gz | |
Revert to the 2.8.2 version until bug 24982 is resolved
| -rw-r--r-- | src/rabbit_control_main.erl | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index 294080064c..4724555baf 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -490,12 +490,8 @@ wait_for_process_death(Pid) -> read_pid_file(PidFile, Wait) -> case {file:read_file(PidFile), Wait} of {{ok, Bin}, _} -> - S = binary_to_list(Bin), - Spid = case string:words(S) > 1 of - true -> string:sub_word(S, 1); - false -> string:strip(binary_to_list(Bin), right, $\n) - end, - try list_to_integer(Spid) + S = string:strip(binary_to_list(Bin), right, $\n), + try list_to_integer(S) catch error:badarg -> exit({error, {garbage_in_pid_file, PidFile}}) end, |