Merge pull request #884 from binarin/rabbitmq-server-818-master

Merge 883 into master

1 files changed, 12 insertions, 7 deletions

diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
index 4c5691bedb..a4a5c9dc19 100644
--- a/scripts/rabbitmq-env.bat
+++ b/scripts/rabbitmq-env.bat
@@ -30,10 +30,14 @@ REM ## Set defaults
 REM . ${SCRIPT_DIR}/rabbitmq-defaults

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

 

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

-REM ## Common defaults

-REM SERVER_ERL_ARGS="+P 1048576"

-REM

+set DEFAULT_SCHEDULER_BIND_TYPE=db

+

+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 # warn about old rabbitmq.conf file, if no new one

 REM if [ -f /etc/rabbitmq/rabbitmq.conf ] && \

 REM    [ ! -f ${CONF_ENV_FILE} ] ; then

@@ -41,9 +45,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 +154,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}