diff options
| author | Matthias Radestock <matthias@lshift.net> | 2008-12-10 18:05:51 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2008-12-10 18:05:51 +0000 |
| commit | 2b4ed321de3800572df3ecd6ac9a808e61539468 (patch) | |
| tree | dfe34f462ef375814185b2ba2b01b3bcbdbcf5e1 /src | |
| parent | aa0f1d27376674c0383138bccdd73b9ff1dfae22 (diff) | |
| parent | 9a4aa2cafaf172dcce8d1f01419d2101e903027b (diff) | |
| download | rabbitmq-server-git-2b4ed321de3800572df3ecd6ac9a808e61539468.tar.gz | |
merge bug19914 into default
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_control.erl | 11 | ||||
| -rw-r--r-- | src/rabbit_multi.erl | 12 |
2 files changed, 12 insertions, 11 deletions
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index 98d57c3141..5d50ed56a9 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -122,11 +122,12 @@ Available commands: Quiet output mode is selected with the \"-q\" flag. Informational messages are suppressed when quiet mode is in effect. -<node> should be the name of the master node of the RabbitMQ cluster. It -defaults to the node named \"rabbit\" on the local host. On a host named -\"server.example.com\", the master node will usually be rabbit@server (unless -NODENAME has been set to some non-default value at broker startup time). The -output of hostname -s is usually the correct suffix to use after the \"@\" sign. +<node> should be the name of the master node of the RabbitMQ +cluster. It defaults to the node named \"rabbit\" on the local +host. On a host named \"server.example.com\", the master node will +usually be rabbit@server (unless RABBITMQ_NODENAME has been set to +some non-default value at broker startup time). The output of hostname +-s is usually the correct suffix to use after the \"@\" sign. "), halt(1). diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl index e5b5960363..7f6eaa8e93 100644 --- a/src/rabbit_multi.erl +++ b/src/rabbit_multi.erl @@ -90,8 +90,8 @@ action(start_all, [NodeCount], RpcTimeout) -> io:format("Starting all nodes...~n", []), N = list_to_integer(NodeCount), {NodePids, Running} = start_nodes(N, N, [], true, - getenv("NODENAME"), - getenv("NODE_PORT"), + getenv("RABBITMQ_NODENAME"), + getenv("RABBITMQ_NODE_PORT"), RpcTimeout), write_pids_file(NodePids), case Running of @@ -161,8 +161,8 @@ start_nodes(N, Total, PNodePid, Running, NodeNameBase, NodePortBase, RpcTimeout). start_node(NodeName, NodePort, RpcTimeout) -> - os:putenv("NODENAME", NodeName), - os:putenv("NODE_PORT", integer_to_list(NodePort)), + os:putenv("RABBITMQ_NODENAME", NodeName), + os:putenv("RABBITMQ_NODE_PORT", integer_to_list(NodePort)), Node = rabbit_misc:localnode(list_to_atom(NodeName)), io:format("Starting node ~s...~n", [Node]), case rpc:call(Node, os, getpid, []) of @@ -219,13 +219,13 @@ with_os(Handlers) -> end. script_filename() -> - ScriptHome = getenv("SCRIPT_HOME"), + ScriptHome = getenv("RABBITMQ_SCRIPT_HOME"), ScriptName = with_os( [{unix , fun () -> "rabbitmq-server" end}, {win32, fun () -> "rabbitmq-server.bat" end}]), ScriptHome ++ "/" ++ ScriptName ++ " -noinput". -pids_file() -> getenv("PIDS_FILE"). +pids_file() -> getenv("RABBITMQ_PIDS_FILE"). write_pids_file(Pids) -> FileName = pids_file(), |