Merging default into bug21875

7 files changed, 26 insertions, 30 deletions

diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi
index 8341d35c..59050692 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=
diff --git a/scripts/rabbitmq-multi.bat b/scripts/rabbitmq-multi.bat
index a4b7f2e9..a4f8c8b4 100644
--- a/scripts/rabbitmq-multi.bat
+++ b/scripts/rabbitmq-multi.bat
@@ -42,8 +42,12 @@ if "!RABBITMQ_BASE!"=="" (
     set RABBITMQ_BASE=!APPDATA!\RabbitMQ

 )

 

+if "!COMPUTERNAME!"=="" (

+    set COMPUTERNAME=localhost

+)

+

 if "!RABBITMQ_NODENAME!"=="" (

-    set RABBITMQ_NODENAME=rabbit

+    set RABBITMQ_NODENAME=rabbit@!COMPUTERNAME!

 )

 

 if "!RABBITMQ_NODE_IP_ADDRESS!"=="" (

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index aaa131ee..e2028728 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}]"
@@ -81,12 +82,6 @@ fi
 [ -f  "${RABBITMQ_LOGS}" ] && cat "${RABBITMQ_LOGS}" >> "${RABBITMQ_LOGS}${RABBITMQ_BACKUP_EXTENSION}"
 [ -f  "${RABBITMQ_SASL_LOGS}" ] && cat "${RABBITMQ_SASL_LOGS}" >> "${RABBITMQ_SASL_LOGS}${RABBITMQ_BACKUP_EXTENSION}"
 
-if [ -f "$RABBITMQ_CLUSTER_CONFIG_FILE" ]; then
-    RABBITMQ_CLUSTER_CONFIG_OPTION="-rabbit cluster_config \"$RABBITMQ_CLUSTER_CONFIG_FILE\""
-else
-    RABBITMQ_CLUSTER_CONFIG_OPTION=""
-fi
-
 RABBITMQ_START_RABBIT=
 [ "x" = "x$RABBITMQ_ALLOW_INPUT" ] && RABBITMQ_START_RABBIT='-noinput' 
 
@@ -138,6 +133,5 @@ exec erl \
     -os_mon start_disksup false \
     -os_mon start_memsup false \
     -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \
-    ${RABBITMQ_CLUSTER_CONFIG_OPTION} \
     ${RABBITMQ_SERVER_START_ARGS} \
     "$@"
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index b3046594..86fbc463 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -42,8 +42,12 @@ if "!RABBITMQ_BASE!"=="" (
     set RABBITMQ_BASE=!APPDATA!\RabbitMQ

 )

 

+if "!COMPUTERNAME!"=="" (

+    set COMPUTERNAME=localhost

+)

+

 if "!RABBITMQ_NODENAME!"=="" (

-    set RABBITMQ_NODENAME=rabbit

+    set RABBITMQ_NODENAME=rabbit@!COMPUTERNAME!

 )

 

 if "!RABBITMQ_NODE_IP_ADDRESS!"=="" (

@@ -99,14 +103,6 @@ if exist "!SASL_LOGS!" (
 rem End of log management

 

 

-if "!RABBITMQ_CLUSTER_CONFIG_FILE!"=="" (

-    set RABBITMQ_CLUSTER_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq_cluster.config

-)

-set CLUSTER_CONFIG=

-if not exist "!RABBITMQ_CLUSTER_CONFIG_FILE!" GOTO L1

-set CLUSTER_CONFIG=-rabbit cluster_config \""!RABBITMQ_CLUSTER_CONFIG_FILE:\=/!"\"

-:L1

-

 if "!RABBITMQ_MNESIA_DIR!"=="" (

     set RABBITMQ_MNESIA_DIR=!RABBITMQ_MNESIA_BASE!/!RABBITMQ_NODENAME!-mnesia

 )

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index a25e236a..2217a451 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -48,8 +48,12 @@ if "!RABBITMQ_BASE!"=="" (
     set RABBITMQ_BASE=!APPDATA!\!RABBITMQ_SERVICENAME!

 )

 

+if "!COMPUTERNAME!"=="" (

+    set COMPUTERNAME=localhost

+)

+

 if "!RABBITMQ_NODENAME!"=="" (

-    set RABBITMQ_NODENAME=rabbit

+    set RABBITMQ_NODENAME=rabbit@!COMPUTERNAME!

 )

 

 if "!RABBITMQ_NODE_IP_ADDRESS!"=="" (

@@ -132,14 +136,6 @@ if exist "!SASL_LOGS!" (
 rem End of log management

 

 

-if "!RABBITMQ_CLUSTER_CONFIG_FILE!"=="" (

-    set RABBITMQ_CLUSTER_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq_cluster.config

-)

-set CLUSTER_CONFIG=

-if not exist "!RABBITMQ_CLUSTER_CONFIG_FILE!" GOTO L1

-set CLUSTER_CONFIG=-rabbit cluster_config \""!RABBITMQ_CLUSTER_CONFIG_FILE:\=/!"\"

-:L1

-

 if "!RABBITMQ_MNESIA_DIR!"=="" (

     set RABBITMQ_MNESIA_DIR=!RABBITMQ_MNESIA_BASE!/!RABBITMQ_NODENAME!-mnesia

 )

diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl
index cfb775eb..92e5312b 100755
--- a/scripts/rabbitmqctl
+++ b/scripts/rabbitmqctl
@@ -30,7 +30,8 @@
 ##   Contributor(s): ______________________________________.
 ##
 
-NODENAME=rabbit
+[ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname -s`
+NODENAME=rabbit@${HOSTNAME%%.*}
 
 . `dirname $0`/rabbitmq-env
 
diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat
index 55572451..563b9e58 100644
--- a/scripts/rabbitmqctl.bat
+++ b/scripts/rabbitmqctl.bat
@@ -38,8 +38,12 @@ set TDP0=%~dp0
 set STAR=%*

 setlocal enabledelayedexpansion

 

+if "!COMPUTERNAME!"=="" (

+    set COMPUTERNAME=localhost

+)

+

 if "!RABBITMQ_NODENAME!"=="" (

-    set RABBITMQ_NODENAME=rabbit

+    set RABBITMQ_NODENAME=rabbit@!COMPUTERNAME!

 )

 

 if not exist "!ERLANG_HOME!\bin\erl.exe" (