diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-11-27 18:23:13 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-11-27 18:23:13 +0000 |
| commit | 615ff0d8f91b95112616c9af05b48bec93e5377b (patch) | |
| tree | 2e71b47f08f323225e61e1926abda8a98c10bf6d /src/rabbit.erl | |
| parent | 3b58d435d3a5fe4775d810af4ed4c53a5034def7 (diff) | |
| parent | 42d19be46fbcc0381a0076c40ddea7d9ce212134 (diff) | |
| download | rabbitmq-server-git-615ff0d8f91b95112616c9af05b48bec93e5377b.tar.gz | |
re-merge bug25303 into default
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index c3a6d283b2..7b8348fc31 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -400,13 +400,11 @@ status() -> is_running() -> is_running(node()). -is_running(Node) -> - rabbit_nodes:is_running(Node, rabbit). +is_running(Node) -> rabbit_nodes:is_running(Node, rabbit). environment() -> - lists:keysort( - 1, [P || P = {K, _} <- application:get_all_env(rabbit), - K =/= default_pass]). + lists:keysort(1, [P || P = {K, _} <- application:get_all_env(rabbit), + K =/= default_pass]). rotate_logs(BinarySuffix) -> Suffix = binary_to_list(BinarySuffix), |