summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Wragg <dpw@lshift.net>2010-02-15 12:44:56 +0000
committerDavid Wragg <dpw@lshift.net>2010-02-15 12:44:56 +0000
commit4d526677eabf7c747e2a95ff2474479f80ba7db4 (patch)
tree5e7336ad983950af780a463c4d759d83984f623f /src
parentdc574a8ef52dd292084dedfc0692665285f3a7a7 (diff)
downloadrabbitmq-server-git-4d526677eabf7c747e2a95ff2474479f80ba7db4.tar.gz
Avoid the use of spawn_executable on non-Windows platforms
The Windows-only issue addressed in bug22282 requires the use of spawn_executable, which was introduced in OTP R13. But for other platforms we'd like to continue to support R12, and so we should stick to plain spawn.
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_multi.erl5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl
index bfafa6ff05..8c898498e6 100644
--- a/src/rabbit_multi.erl
+++ b/src/rabbit_multi.erl
@@ -222,9 +222,8 @@ run_rabbitmq_server() ->
{win32, fun run_rabbitmq_server_win32/0}]).
run_rabbitmq_server_unix() ->
- FullPath = getenv("RABBITMQ_SCRIPT_HOME") ++ "/rabbitmq-server",
- erlang:open_port({spawn_executable, FullPath},
- [{arg0, FullPath}, {args, ["-noinput"]}, nouse_stdio]).
+ CmdLine = getenv("RABBITMQ_SCRIPT_HOME") ++ "/rabbitmq-server -noinput",
+ erlang:open_port({spawn, CmdLine}, [nouse_stdio]).
run_rabbitmq_server_win32() ->
Cmd = filename:nativename(os:find_executable("cmd")),