summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2010-11-05 11:16:20 +0000
committerEmile Joubert <emile@rabbitmq.com>2010-11-05 11:16:20 +0000
commit174ffe5de5ae951e0d74e31a94b733768de41e0d (patch)
treef26b9c309eb33ff762861ef177f3e0bddb44b5b2
parentf525c97b059b62cf68361cd70e346339aa088582 (diff)
downloadrabbitmq-server-bug23299.tar.gz
Make brokers launched from rabbitmq_multi.bat restartablebug23299
-rw-r--r--src/rabbit_multi.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl
index b48d0aa3..0440dbe4 100644
--- a/src/rabbit_multi.erl
+++ b/src/rabbit_multi.erl
@@ -227,11 +227,11 @@ run_rabbitmq_server_unix() ->
run_rabbitmq_server_win32() ->
Cmd = filename:nativename(os:find_executable("cmd")),
- CmdLine = "\"" ++ getenv("RABBITMQ_SCRIPT_HOME")
- ++ "\\rabbitmq-server.bat\" -noinput",
+ CmdLine = "\"" ++ getenv("RABBITMQ_SCRIPT_HOME") ++
+ "\\rabbitmq-server.bat\" -noinput -detached",
erlang:open_port({spawn_executable, Cmd},
[{arg0, Cmd}, {args, ["/q", "/s", "/c", CmdLine]},
- nouse_stdio, hide]).
+ nouse_stdio]).
is_rabbit_running(Node, RpcTimeout) ->
case rpc:call(Node, rabbit, status, [], RpcTimeout) of
@@ -315,7 +315,7 @@ is_dead(Pid) ->
end},
{win32, fun () ->
Res = os:cmd("tasklist /nh /fi \"pid eq " ++
- PidS ++ "\""),
+ PidS ++ "\" 2>&1"),
case re:run(Res, "erl\\.exe", [{capture, none}]) of
match -> false;
_ -> true