diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2015-07-02 13:58:43 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2015-07-02 13:58:43 +0300 |
| commit | 0c9cd74784d287d48a7cc1ddac4ae57c062a5dfc (patch) | |
| tree | 0a012ab422c5b8a7aca0f761a35f4fc57054fa65 /scripts/rabbitmq-env | |
| parent | 4460f309e0943292417c2c87f25400e1cd4e815f (diff) | |
| parent | 32b45d8dbc32a6518ac0b029d05d0023a9cd0fab (diff) | |
| download | rabbitmq-server-git-0c9cd74784d287d48a7cc1ddac4ae57c062a5dfc.tar.gz | |
Merge branch 'stable'
Diffstat (limited to 'scripts/rabbitmq-env')
| -rwxr-xr-x | scripts/rabbitmq-env | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index ea27d59089..7bf7a97ed8 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -51,7 +51,7 @@ RABBITMQ_HOME="${RABBITMQ_SCRIPTS_DIR}/.." . ${RABBITMQ_SCRIPTS_DIR}/rabbitmq-defaults ## Common defaults -SERVER_ERL_ARGS="+K true +A30 +P 1048576 \ +SERVER_ERL_ARGS="+K true +P 1048576 \ -kernel inet_default_connect_options [{nodelay,true}]" # warn about old rabbitmq.conf file, if no new one @@ -175,6 +175,7 @@ DEFAULT_NODE_PORT=5672 [ "x" = "x$RABBITMQ_DIST_PORT" ] && [ "x" != "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_DIST_PORT=$((${RABBITMQ_NODE_PORT} + 20000)) [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} +[ "x" = "x$RABBITMQ_IO_THREAD_POOL_SIZE" ] && RABBITMQ_IO_THREAD_POOL_SIZE=${IO_THREAD_POOL_SIZE} [ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS=${SERVER_ERL_ARGS} [ "x" = "x$RABBITMQ_CONFIG_FILE" ] && RABBITMQ_CONFIG_FILE=${CONFIG_FILE} [ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE} @@ -194,6 +195,8 @@ rmq_normalize_path_var \ [ "x" = "x$RABBITMQ_PID_FILE" ] && RABBITMQ_PID_FILE=${RABBITMQ_MNESIA_DIR}.pid rmq_normalize_path_var RABBITMQ_PID_FILE +[ "x" = "x$RABBITMQ_BOOT_MODULE" ] && RABBITMQ_BOOT_MODULE=${BOOT_MODULE} + [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${PLUGINS_EXPAND_DIR} [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME}-plugins-expand rmq_normalize_path_var RABBITMQ_PLUGINS_EXPAND_DIR |