diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2017-06-26 19:22:32 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2017-06-26 19:22:32 +0200 |
| commit | 6381a2ed76c510329fabd0510d78018a93403097 (patch) | |
| tree | 4e4c2f89dbb72dbe8a5eee311722ad012573eb1b | |
| parent | 3c7bebf067c6e39b56becabef1432db62bdf3a3d (diff) | |
| parent | dce3829a9c116f566554aaf1f2772b27333529b4 (diff) | |
| download | rabbitmq-server-git-6381a2ed76c510329fabd0510d78018a93403097.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | src/rabbit_nodes.erl | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/rabbit_nodes.erl b/src/rabbit_nodes.erl index 7a4b1c9dea..850ec48bdc 100644 --- a/src/rabbit_nodes.erl +++ b/src/rabbit_nodes.erl @@ -40,7 +40,6 @@ -spec is_process_running(node(), atom()) -> boolean(). -spec cluster_name() -> binary(). -spec set_cluster_name(binary(), rabbit_types:username()) -> 'ok'. --spec ensure_epmd() -> 'ok'. -spec all_running() -> [node()]. %%---------------------------------------------------------------------------- @@ -214,19 +213,6 @@ set_cluster_name(Name, Username) -> rabbit_runtime_parameters:set_global(cluster_name, BinaryName, Username). ensure_epmd() -> - {ok, Prog} = init:get_argument(progname), - ID = rabbit_misc:random(1000000000), - Port = open_port( - {spawn_executable, os:find_executable(Prog)}, - [{args, ["-sname", rabbit_misc:format("epmd-starter-~b", [ID]), - "-noshell", "-eval", "halt()."]}, - exit_status, stderr_to_stdout, use_stdio]), - port_shutdown_loop(Port). - -port_shutdown_loop(Port) -> - receive - {Port, {exit_status, _Rc}} -> ok; - {Port, _} -> port_shutdown_loop(Port) - end. + rabbit_nodes_common:ensure_epmd(). all_running() -> rabbit_mnesia:cluster_nodes(running). |