diff options
| author | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-05-23 13:14:02 +0100 |
|---|---|---|
| committer | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-05-23 13:14:02 +0100 |
| commit | 7476ca3e88fca5e8e95e92a781af29f43b47ffdb (patch) | |
| tree | 79cf1c96023b90065a46fe51830bfc2cf56910be | |
| parent | 9baf037b3b51460036cd06625ba711fe9d943f38 (diff) | |
| download | rabbitmq-server-git-7476ca3e88fca5e8e95e92a781af29f43b47ffdb.tar.gz | |
add `rabbit_misc:rabbit_version/0'
also, `get_key', not `get_env'.
| -rw-r--r-- | src/rabbit_misc.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_mnesia.erl | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 706de8359b..29571ecf06 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -62,6 +62,7 @@ -export([quit/1]). -export([os_cmd/1]). -export([gb_sets_difference/2]). +-export([rabbit_version/0]). %%---------------------------------------------------------------------------- @@ -209,6 +210,7 @@ -spec(quit/1 :: (integer() | string()) -> no_return()). -spec(os_cmd/1 :: (string()) -> string()). -spec(gb_sets_difference/2 :: (gb_set(), gb_set()) -> gb_set()). +-spec(rabbit_version/0 :: () -> string()). -endif. @@ -925,3 +927,7 @@ os_cmd(Command) -> gb_sets_difference(S1, S2) -> gb_sets:fold(fun gb_sets:delete_any/2, S1, S2). + +rabbit_version() -> + {ok, VSN} = application:get_key(rabbit, vsn), + VSN. diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index a6843020bb..f2ede9a198 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -328,7 +328,7 @@ cluster_status_if_running() -> end. node_info() -> - {erlang:system_info(otp_release), application:get_env(rabbit, vsn), + {erlang:system_info(otp_release), rabbit_misc:rabbit_version(), cluster_status_if_running()}. is_disc_node() -> mnesia:system_info(use_dir). @@ -543,7 +543,7 @@ check_cluster_consistency() -> fun (OTP) -> CheckVsn(erlang:system_info(otp_release), OTP, "OTP") end, CheckRabbit = fun (Rabbit) -> - CheckVsn(application:get_env(rabbit, vsn), Rabbit, "Rabbit") + CheckVsn(rabbit_misc:rabbit_version(), Rabbit, "Rabbit") end, CheckNodes = fun (Node, AllNodes) -> |