Set scheduler bindings in rabbitmq-env.bat for windows

rename SCHEDULING to SCHEDULER in line with erlang documentation

4 files changed, 19 insertions, 22 deletions

diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index b5933d495f..44fac723a5 100755
--- a/scripts/rabbitmq-env
+++ b/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="tnnps"
-[ "x" = "x$RABBITMQ_SCHEDULING_BIND_TYPE" ] && RABBITMQ_SCHEDULING_BIND_TYPE=${DEFAULT_SCHEDULING_BIND_TYPE}
+DEFAULT_SCHEDULER_BIND_TYPE="tnnps"
+[ "x" = "x$RABBITMQ_SCHEDULER_BIND_TYPE" ] && RABBITMQ_SCHEDULER_BIND_TYPE=${DEFAULT_SCHEDULER_BIND_TYPE}
 
 ## Common defaults
-SERVER_ERL_ARGS="+P 1048576 +stbt $RABBITMQ_SCHEDULING_BIND_TYPE "
+SERVER_ERL_ARGS="+P 1048576 +stbt $RABBITMQ_SCHEDULER_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
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
index ea9cf45962..b7ae20c902 100644
--- a/scripts/rabbitmq-env.bat
+++ b/scripts/rabbitmq-env.bat
@@ -30,6 +30,14 @@ REM ## Set defaults
 REM . ${SCRIPT_DIR}/rabbitmq-defaults

 call "%SCRIPT_DIR%\rabbitmq-defaults.bat"

 

+set DEFAULT_SCHEDULER_BIND_TYPE=tnnps

+REM [ "x" = "x$RABBITMQ_SCHEDULER_BIND_TYPE" ] && RABBITMQ_SCHEDULER_BIND_TYPE=${DEFAULT_SCHEDULER_BIND_TYPE}

+

+REM set the default scheduling bind type

+if "!RABBITMQ_SCHEDULER_BIND_TYPE!"=="" (

+    set RABBITMQ_SCHEDULER_BIND_TYPE=!DEFAULT_SCHEDULER_BIND_TYPE!

+)

+

 REM These common defaults aren't referenced in the batch scripts

 REM ## Common defaults

 REM SERVER_ERL_ARGS="+P 1048576"

@@ -41,9 +49,8 @@ REM     echo -n "WARNING: ignoring /etc/rabbitmq/rabbitmq.conf -- "
 REM     echo "location has moved to ${CONF_ENV_FILE}"

 REM fi

 

-REM ERL_ARGS aren't referenced in the batch scripts

 REM Common defaults

-REM set SERVER_ERL_ARGS=+P 1048576

+set SERVER_ERL_ARGS=+P 1048576 +stbt !RABBITMQ_SCHEDULER_BIND_TYPE! 

 

 REM ## Get configuration variables from the configure environment file

 REM [ -f ${CONF_ENV_FILE} ] && . ${CONF_ENV_FILE} || true

@@ -151,7 +158,9 @@ if "!RABBITMQ_DIST_PORT!"=="" (
 )

 

 REM [ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS=${SERVER_ERL_ARGS}

-REM No Windows equivalent

+if "!RABBITMQ_SERVER_ERL_ARGS!"=="" (

+    set RABBITMQ_SERVER_ERL_ARGS=!SERVER_ERL_ARGS!

+)

 

 REM [ "x" = "x$RABBITMQ_CONFIG_FILE" ] && RABBITMQ_CONFIG_FILE=${CONFIG_FILE}

 if "!RABBITMQ_CONFIG_FILE!"=="" (

@@ -386,8 +395,8 @@ goto :filter_paths_done
 set paths=%1

 set paths=%paths:"=%

 for /f "tokens=1* delims=;" %%a in ("%paths%") do (

-    if not "%%a" == "" call :filter_path %%a

-    if not "%%b" == "" call :filter_paths %%b

+    if not "%%a" == "" call :filter_path "%%a"

+    if not "%%b" == "" call :filter_paths "%%b"

 )

 set paths=

 exit /b

diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index a8ba29c6fb..585a830efa 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -112,10 +112,6 @@ if "!ENV_OK!"=="false" (
     EXIT /b 78

 )

 

-if "!RABBITMQ_SCHEDULING_BIND_TYPE!"=="" (

-    set RABBITMQ_SCHEDULING_BIND_TYPE="tnnps"

-)

-

 "!ERLANG_HOME!\bin\erl.exe" ^

 -pa "!RABBITMQ_EBIN_ROOT!" ^

 -boot start_sasl ^

@@ -124,10 +120,8 @@ if "!RABBITMQ_SCHEDULING_BIND_TYPE!"=="" (
 !RABBITMQ_NAME_TYPE! !RABBITMQ_NODENAME! ^

 +W w ^

 +A "!RABBITMQ_IO_THREAD_POOL_SIZE!" ^

-+stbt "!RABBITMQ_SCHEDULING_BIND_TYPE!" ^

-+P 1048576 ^

-!RABBITMQ_LISTEN_ARG! ^

 !RABBITMQ_SERVER_ERL_ARGS! ^

+!RABBITMQ_LISTEN_ARG! ^

 -kernel inet_default_connect_options "[{nodelay, true}]" ^

 !RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS! ^

 -sasl errlog_type error ^

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index ee2c406e36..f8a8d5a464 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -173,10 +173,6 @@ if "!RABBITMQ_SERVICE_RESTART!"=="" (
     set RABBITMQ_SERVICE_RESTART=restart

 )

 

-if "!RABBITMQ_SCHEDULING_BIND_TYPE!"=="" (

-    set RABBITMQ_SCHEDULING_BIND_TYPE="tnnps"

-)

-

 set ERLANG_SERVICE_ARGUMENTS= ^

 -pa "!RABBITMQ_EBIN_ROOT!" ^

 -boot start_sasl ^

@@ -184,10 +180,8 @@ set ERLANG_SERVICE_ARGUMENTS= ^
 !RABBITMQ_CONFIG_ARG! ^

 +W w ^

 +A "!RABBITMQ_IO_THREAD_POOL_SIZE!" ^

-+stbt "!RABBITMQ_SCHEDULING_BIND_TYPE!" ^

-+P 1048576 ^

-!RABBITMQ_LISTEN_ARG! ^

 !RABBITMQ_SERVER_ERL_ARGS! ^

+!RABBITMQ_LISTEN_ARG! ^

 -kernel inet_default_connect_options "[{nodelay,true}]" ^

 !RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS! ^

 -sasl errlog_type error ^