diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-09-29 12:06:28 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-09-29 12:06:28 +0300 |
| commit | 3313372eaee9a6d44e3cd73d616c4012c585ae81 (patch) | |
| tree | ecc99953372aa9ab62937a2fb3275cacc4801048 | |
| parent | 08942e7dcb06ad79e3bc0559e2acacabc6e9c985 (diff) | |
| download | rabbitmq-server-git-3313372eaee9a6d44e3cd73d616c4012c585ae81.tar.gz | |
Move name_type/0 to rabbit_nodes
| -rw-r--r-- | src/rabbit_mnesia_rename.erl | 9 | ||||
| -rw-r--r-- | src/rabbit_nodes.erl | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/rabbit_mnesia_rename.erl b/src/rabbit_mnesia_rename.erl index 323c006262..1111c587ad 100644 --- a/src/rabbit_mnesia_rename.erl +++ b/src/rabbit_mnesia_rename.erl @@ -282,11 +282,4 @@ become(BecomeNode) -> start_distribution(Name) -> rabbit_nodes:ensure_epmd(), - net_kernel:start([Name, name_type()]). - -name_type() -> - case os:getenv("RABBITMQ_USE_LONGNAME") of - "true" -> longnames; - _ -> shortnames - end. - + net_kernel:start([Name, rabbit_nodes:name_type()]). diff --git a/src/rabbit_nodes.erl b/src/rabbit_nodes.erl index 6b5ab499cc..8be379b749 100644 --- a/src/rabbit_nodes.erl +++ b/src/rabbit_nodes.erl @@ -20,7 +20,7 @@ -export([names/1, diagnostics/1, make/1, parts/1, cookie_hash/0, is_running/2, is_process_running/2, cluster_name/0, set_cluster_name/2, ensure_epmd/0, - all_running/0]). + all_running/0, name_type/0]). -include_lib("kernel/include/inet.hrl"). @@ -40,6 +40,12 @@ %%---------------------------------------------------------------------------- +name_type() -> + case os:getenv("RABBITMQ_USE_LONGNAME") of + "true" -> longnames; + _ -> shortnames + end. + names(Hostname) -> rabbit_nodes_common:names(Hostname). |