diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-11-25 18:14:26 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-11-25 18:14:26 +0000 |
| commit | f7d8d4323243de29d9b3fad55c9a17acffa02316 (patch) | |
| tree | 13d3fc110cc8897fa8f3461bf830e0b82120d8c1 /scripts/rabbitmq-server | |
| parent | b930ba473c7799c631be5df0d7fe9b597ebfbd7a (diff) | |
| download | rabbitmq-server-git-f7d8d4323243de29d9b3fad55c9a17acffa02316.tar.gz | |
multi is a convenience. It should blow up when starting > 1 nodes when we have multiple tcp listeners. When starting > 1 nodes, make sure we export the discovered node ip address and port. When starting just 1 node, don't export anything - either rabbit-server will rediscover it in the env, or it's all configured in the config file.
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 8ba7d6b82f..7f08cd9d75 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -44,7 +44,6 @@ SERVER_START_ARGS= . `dirname $0`/rabbitmq-env - if [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] then if [ "x" != "x$RABBITMQ_NODE_PORT" ] @@ -99,7 +98,7 @@ RABBITMQ_CONFIG_ARG= [ -f "${RABBITMQ_CONFIG_FILE}.config" ] && RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE}" RABBITMQ_LISTEN_ARG= -[ "x" != "x$RABBITMQ_NODE_PORT" ] && [ "x" != "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_LISTEN_ARG="-rabbit tcp_listeners '[{"'${RABBITMQ_NODE_IP_ADDRESS}'", '${RABBITMQ_NODE_PORT}'}]'" +[ "x" != "x$RABBITMQ_NODE_PORT" ] && [ "x" != "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_LISTEN_ARG="-rabbit tcp_listeners [{\""${RABBITMQ_NODE_IP_ADDRESS}"\","${RABBITMQ_NODE_PORT}"}]" # we need to turn off path expansion because some of the vars, notably # RABBITMQ_SERVER_ERL_ARGS, contain terms that look like globs and |
