diff options
| author | Tim Watson <tim@rabbitmq.com> | 2012-11-29 13:25:49 +0000 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2012-11-29 13:25:49 +0000 |
| commit | 1ad9e2cbd142ec99f6f49403c67765a208bcfb81 (patch) | |
| tree | 39d149857f48a068e4539ec4f548e728a7054990 /src/rabbit.erl | |
| parent | 1469e0a0ef7f024c332bd5d42bc498ee24bc35bb (diff) | |
| parent | c29c2fcf1a8b3b2ceda3e688de802b5a359edcaf (diff) | |
| download | rabbitmq-server-git-1ad9e2cbd142ec99f6f49403c67765a208bcfb81.tar.gz | |
merge heads
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), |