Renaming

Author: Diana Corbacho

scripts/rabbitmq-env

@@ -62,11 +62,11 @@ RABBITMQ_HOME="$(rmq_realpath "${RABBITMQ_SCRIPTS_DIR}/..")"
 ## Set defaults
 . ${RABBITMQ_SCRIPTS_DIR}/rabbitmq-defaults
 
-DEFAULT_SCHEDULING_BIND_TYPE_FLAG="tnnps"
-[ "x" = "x$RABBITMQ_SCHEDULING_BIND_TYPE_FLAG" ] && RABBITMQ_SCHEDULING_BIND_TYPE_FLAG=${DEFAULT_SCHEDULING_BIND_TYPE_FLAG}
+DEFAULT_SCHEDULING_BIND_TYPE="tnnps"
+[ "x" = "x$RABBITMQ_SCHEDULING_BIND_TYPE" ] && RABBITMQ_SCHEDULING_BIND_TYPE=${DEFAULT_SCHEDULING_BIND_TYPE}
 
 ## Common defaults
-SERVER_ERL_ARGS="+P 1048576 +stbt $RABBITMQ_SCHEDULING_BIND_TYPE_FLAG "
+SERVER_ERL_ARGS="+P 1048576 +stbt $RABBITMQ_SCHEDULING_BIND_TYPE "
 
 # We save the current value of $RABBITMQ_PID_FILE in case it was set by
 # an init script. If $CONF_ENV_FILE overrides it again, we must ignore

scripts/rabbitmq-server.bat

@@ -112,8 +112,8 @@ if "!ENV_OK!"=="false" (
     EXIT /b 78
 )
 
-if "!RABBITMQ_SCHEDULING_BIND_TYPE_FLAG!"=="" (
-    set RABBITMQ_SCHEDULING_BIND_TYPE_FLAG="tnnps"
+if "!RABBITMQ_SCHEDULING_BIND_TYPE!"=="" (
+    set RABBITMQ_SCHEDULING_BIND_TYPE="tnnps"
 )
 
 "!ERLANG_HOME!\bin\erl.exe" ^
@@ -124,7 +124,7 @@ if "!RABBITMQ_SCHEDULING_BIND_TYPE_FLAG!"=="" (
 !RABBITMQ_NAME_TYPE! !RABBITMQ_NODENAME! ^
 +W w ^
 +A "!RABBITMQ_IO_THREAD_POOL_SIZE!" ^
-+stbt "!RABBITMQ_SCHEDULING_BIND_TYPE_FLAG!" ^
++stbt "!RABBITMQ_SCHEDULING_BIND_TYPE!" ^
 +P 1048576 ^
 !RABBITMQ_LISTEN_ARG! ^
 !RABBITMQ_SERVER_ERL_ARGS! ^

scripts/rabbitmq-service.bat

@@ -173,8 +173,8 @@ if "!RABBITMQ_SERVICE_RESTART!"=="" (
     set RABBITMQ_SERVICE_RESTART=restart
 )
 
-if "!RABBITMQ_SCHEDULING_BIND_TYPE_FLAG!"=="" (
-    set RABBITMQ_SCHEDULING_BIND_TYPE_FLAG="tnnps"
+if "!RABBITMQ_SCHEDULING_BIND_TYPE!"=="" (
+    set RABBITMQ_SCHEDULING_BIND_TYPE="tnnps"
 )
 
 set ERLANG_SERVICE_ARGUMENTS= ^
@@ -184,7 +184,7 @@ set ERLANG_SERVICE_ARGUMENTS= ^
 !RABBITMQ_CONFIG_ARG! ^
 +W w ^
 +A "!RABBITMQ_IO_THREAD_POOL_SIZE!" ^
-+stbt "!RABBITMQ_SCHEDULING_BIND_TYPE_FLAG!" ^
++stbt "!RABBITMQ_SCHEDULING_BIND_TYPE!" ^
 +P 1048576 ^
 !RABBITMQ_LISTEN_ARG! ^
 !RABBITMQ_SERVER_ERL_ARGS! ^