diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2010-06-10 13:24:31 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2010-06-10 13:24:31 +0100 |
| commit | 165cf0bba7efc6e3385655562e9b99c551d7bc55 (patch) | |
| tree | e409216d2387bd2b866594f1032d4a41551b9201 | |
| parent | a724c4ce046ac103658b205e00a838542c9ff2dc (diff) | |
| download | rabbitmq-server-165cf0bba7efc6e3385655562e9b99c551d7bc55.tar.gz | |
Make nodename available to rabbitmq-env in startup scripts
| -rwxr-xr-x | scripts/rabbitmq-multi | 5 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 6 | ||||
| -rwxr-xr-x | scripts/rabbitmqctl | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi index c6e1a69d..4bf43598 100755 --- a/scripts/rabbitmq-multi +++ b/scripts/rabbitmq-multi @@ -29,7 +29,8 @@ ## ## Contributor(s): ______________________________________. ## -NODENAME=rabbit +[ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname -s` +NODENAME=rabbit@${HOSTNAME%%.*} SCRIPT_HOME=$(dirname $0) PIDS_FILE=/var/lib/rabbitmq/pids MULTI_ERL_ARGS= @@ -53,7 +54,7 @@ else fi fi [ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname -s` -[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}@${HOSTNAME%%.*} +[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} [ "x" = "x$RABBITMQ_SCRIPT_HOME" ] && RABBITMQ_SCRIPT_HOME=${SCRIPT_HOME} [ "x" = "x$RABBITMQ_PIDS_FILE" ] && RABBITMQ_PIDS_FILE=${PIDS_FILE} [ "x" = "x$RABBITMQ_MULTI_ERL_ARGS" ] && RABBITMQ_MULTI_ERL_ARGS=${MULTI_ERL_ARGS} diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 0ee43649..2261b56e 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -30,7 +30,8 @@ ## Contributor(s): ______________________________________. ## -NODENAME=rabbit +[ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname -s` +NODENAME=rabbit@${HOSTNAME%%.*} SERVER_ERL_ARGS="+K true +A30 +P 1048576 \ -kernel inet_default_listen_options [{nodelay,true}] \ -kernel inet_default_connect_options [{nodelay,true}]" @@ -56,8 +57,7 @@ else then RABBITMQ_NODE_PORT=${DEFAULT_NODE_PORT} fi fi -[ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname -s` -[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}@${HOSTNAME%%.*} +[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} [ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS=${SERVER_ERL_ARGS} [ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=${CLUSTER_CONFIG_FILE} [ "x" = "x$RABBITMQ_CONFIG_FILE" ] && RABBITMQ_CONFIG_FILE=${CONFIG_FILE} diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl index c204fc5a..92e5312b 100755 --- a/scripts/rabbitmqctl +++ b/scripts/rabbitmqctl @@ -30,12 +30,12 @@ ## Contributor(s): ______________________________________. ## -NODENAME=rabbit +[ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname -s` +NODENAME=rabbit@${HOSTNAME%%.*} . `dirname $0`/rabbitmq-env -[ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname -s` -[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}@${HOSTNAME%%.*} +[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} [ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS} exec erl \ |