You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
31 lines
1.3 KiB
31 lines
1.3 KiB
From: Peter Lemenkov <lemenkov@redhat.com> |
|
Date: Fri, 15 Jul 2016 16:01:08 +0200 |
|
Subject: [PATCH] Use proto_dist from command line |
|
|
|
Use protocol distribution value from command line when provided instead |
|
of always using default value (inet_tcp) when trying to check epmd. |
|
|
|
If provided more than one protocol distribution types, then use the |
|
first one. |
|
|
|
Signed-off-by: Peter Lemenkov <lemenkov@redhat.com> |
|
|
|
diff --git a/src/rabbit_nodes_common.erl b/src/rabbit_nodes_common.erl |
|
index 706df55..e1932cc 100644 |
|
--- a/src/rabbit_nodes_common.erl |
|
+++ b/src/rabbit_nodes_common.erl |
|
@@ -80,9 +80,14 @@ do_ensure_epmd(false, Prog) -> |
|
rabbit_log:error("ensure_epmd: unable to find executable '~s' in PATH: '~s'", [Prog, Path]); |
|
do_ensure_epmd(Exe, _) -> |
|
ID = rabbit_misc:random(1000000000), |
|
+ ProtoDist = case init:get_argument(proto_dist) of |
|
+ {ok, [Proto | _Protos]} -> Proto; |
|
+ error -> "inet_tcp" |
|
+ end, |
|
Port = open_port( |
|
{spawn_executable, Exe}, |
|
[{args, ["-sname", rabbit_misc:format("epmd-starter-~b", [ID]), |
|
+ "-proto_dist", rabbit_misc:format("~p", [ProtoDist]), |
|
"-noshell", "-eval", "halt()."]}, |
|
exit_status, stderr_to_stdout, use_stdio]), |
|
port_shutdown_loop(Port).
|
|
|