diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-11-28 19:40:20 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-11-28 19:40:20 +0000 |
| commit | 39c5bb32fb6f61566f977ca6fde9750216237a78 (patch) | |
| tree | 5606efa504be26d2d3763f66079b78646c329d4c /src/rabbit.erl | |
| parent | f34deb61f904f7432b169cc5203415842920691f (diff) | |
| parent | 615ff0d8f91b95112616c9af05b48bec93e5377b (diff) | |
| download | rabbitmq-server-git-39c5bb32fb6f61566f977ca6fde9750216237a78.tar.gz | |
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), |