diff options
author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-10-31 16:18:51 +0000 |
---|---|---|
committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-10-31 16:18:51 +0000 |
commit | f5d3077b8fa3880380ec0a4bab9fecdb6fff5d5c (patch) | |
tree | 3a5c460ef5c52d5ebe0c71c33ff86fdf2b05eddc | |
parent | 202a08505ca8569d84dd590f2bf6a9c0e23cc815 (diff) | |
download | rabbitmq-server-f5d3077b8fa3880380ec0a4bab9fecdb6fff5d5c.tar.gz |
refactor
-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 11638ee9..850c79f4 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -169,8 +169,8 @@ action(stop, Node, Args, _Opts, Inform) -> case {Res, Args} of {ok, [PidFile]} -> wait_for_process_death( read_pid_file(PidFile, false)); - {_, []} -> ok; - _ -> exit({badarg, Args}) + {ok, [_, _| _]} -> exit({badarg, Args}); + _ -> ok end, Res; @@ -398,7 +398,7 @@ read_pid_file(PidFile, Wait) -> S = string:strip(binary_to_list(Bin), right, $\n), try list_to_integer(S) catch error:badarg -> - exit({error, {garbage_in_pid_file, S}}) + exit({error, {garbage_in_pid_file, PidFile}}) end, S; {{error, enoent}, true} -> |