summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDiana Corbacho <diana.corbacho@erlang-solutions.com>2016-07-13 11:03:50 +0100
committerDiana Corbacho <diana.corbacho@erlang-solutions.com>2016-07-13 11:03:50 +0100
commit179873dc29cfd156986d0a02f61e8961f8edcda6 (patch)
treec78378e7eb0d1e4b4006de3e15efd21c343b71df /scripts
parentd956c5cb97ff0e9a95d14d307e67aabcfaaa1c63 (diff)
downloadrabbitmq-server-git-179873dc29cfd156986d0a02f61e8961f8edcda6.tar.gz
Renaming
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/rabbitmq-env6
-rw-r--r--scripts/rabbitmq-server.bat6
-rw-r--r--scripts/rabbitmq-service.bat6
3 files changed, 9 insertions, 9 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index 87385d484a..b5933d495f 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_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
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 06094e0d6f..a8ba29c6fb 100644
--- a/scripts/rabbitmq-server.bat
+++ b/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! ^
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 2831b262df..ee2c406e36 100644
--- a/scripts/rabbitmq-service.bat
+++ b/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! ^