summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2015-03-11 13:13:20 +0000
committerSimon MacMullen <simon@rabbitmq.com>2015-03-11 13:13:20 +0000
commit0ecbdddce7d941089be013b4013515883e2729e9 (patch)
tree0caae0c7a060832b49ab296bd70809a2b493f3b7 /src
parentc4cd61709b7981684fdf05c099de54951ca44193 (diff)
downloadrabbitmq-server-git-0ecbdddce7d941089be013b4013515883e2729e9.tar.gz
More reliable way to find the erl executable.
The old way did not work if erl was not in ${ERLANG_HOME}/bin. The new way looks like it should only work if erl is on the ${PATH} - but in fact the Erlang VM arranges things so that is always true!
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_nodes.erl3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/rabbit_nodes.erl b/src/rabbit_nodes.erl
index d3c0e55ff8..bbe0d35719 100644
--- a/src/rabbit_nodes.erl
+++ b/src/rabbit_nodes.erl
@@ -200,11 +200,10 @@ set_cluster_name(Name) ->
rabbit_runtime_parameters:set_global(cluster_name, Name).
ensure_epmd() ->
- {ok, Root} = init:get_argument(root),
{ok, Prog} = init:get_argument(progname),
ID = random:uniform(1000000000),
Port = open_port(
- {spawn_executable, filename:join([Root, "bin", Prog])},
+ {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]),