diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2012-12-05 14:34:10 +0000 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2012-12-05 14:34:10 +0000 |
| commit | 2f3d6d8de8323e39ea6199db16e25503d35ee021 (patch) | |
| tree | ba324a56be5da4551bf994a70dad45e81f2dcd7d /src/rabbit.erl | |
| parent | 753753290e81acfae7fa652438864c8a8590870a (diff) | |
| parent | 2964916c9699ce2dde24b4fa42325d0817e4ef6e (diff) | |
| download | rabbitmq-server-git-2f3d6d8de8323e39ea6199db16e25503d35ee021.tar.gz | |
Merged stable 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), |