diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-01-25 15:21:20 +0000 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-01-25 15:21:20 +0000 |
| commit | 64ce2d2870972fb4cd32dc048cc03ee192383f58 (patch) | |
| tree | 23c86f8494f74c3be42ab186d1a267300d229e88 | |
| parent | 50656f5f4439869590134e7704e71268bf293ca9 (diff) | |
| parent | 42f6d4b64db4dc90c480663368049301039ba647 (diff) | |
| download | rabbitmq-server-64ce2d2870972fb4cd32dc048cc03ee192383f58.tar.gz | |
merge from default (rabbitmq-multi works again)
| -rwxr-xr-x | scripts/rabbitmq-multi | 2 | ||||
| -rw-r--r-- | scripts/rabbitmq-multi.bat | 2 | ||||
| -rw-r--r-- | src/rabbit_multi.erl | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi index 3c4fa1df..ebcf4b63 100755 --- a/scripts/rabbitmq-multi +++ b/scripts/rabbitmq-multi @@ -23,7 +23,7 @@ CONFIG_FILE=/etc/rabbitmq/rabbitmq . `dirname $0`/rabbitmq-env -DEFAULT_NODE_IP_ADDRESS=auto +DEFAULT_NODE_IP_ADDRESS=0.0.0.0 DEFAULT_NODE_PORT=5672 [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && [ "x" != "x$NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS} [ "x" = "x$RABBITMQ_NODE_PORT" ] && [ "x" != "x$NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT} diff --git a/scripts/rabbitmq-multi.bat b/scripts/rabbitmq-multi.bat index 68767182..a2d10f2e 100644 --- a/scripts/rabbitmq-multi.bat +++ b/scripts/rabbitmq-multi.bat @@ -37,7 +37,7 @@ if "!RABBITMQ_NODENAME!"=="" ( if "!RABBITMQ_NODE_IP_ADDRESS!"=="" (
if not "!RABBITMQ_NODE_PORT!"=="" (
- set RABBITMQ_NODE_IP_ADDRESS=auto
+ set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0
)
) else (
if "!RABBITMQ_NODE_PORT!"=="" (
diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl index 7c07c4fe..ebd7fe8a 100644 --- a/src/rabbit_multi.erl +++ b/src/rabbit_multi.erl @@ -336,6 +336,8 @@ get_node_tcp_listener() -> case application:get_env(rabbit, tcp_listeners) of {ok, [{_IpAddy, _Port} = Listener]} -> Listener; + {ok, [Port]} when is_number(Port) -> + {"0.0.0.0", Port}; {ok, []} -> undefined; {ok, Other} -> |