diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2010-11-05 11:16:20 +0000 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2010-11-05 11:16:20 +0000 |
| commit | 629e5ac496f858351899e595134ee175e92e0060 (patch) | |
| tree | f26b9c309eb33ff762861ef177f3e0bddb44b5b2 | |
| parent | 02baf503d3404fac02321a0d5ce7b1040036c584 (diff) | |
| download | rabbitmq-server-git-629e5ac496f858351899e595134ee175e92e0060.tar.gz | |
Make brokers launched from rabbitmq_multi.bat restartable
| -rw-r--r-- | src/rabbit_multi.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl index b48d0aa394..0440dbe43c 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 |