summaryrefslogtreecommitdiff
path: root/scripts/rabbitmq-server
diff options
context:
space:
mode:
authorDaniil Fedotov <dfedotov@pivotal.io>2016-12-20 18:17:10 +0000
committerDaniil Fedotov <dfedotov@pivotal.io>2016-12-20 18:17:10 +0000
commit5f7553c0bd2eac3fc311761bc2b81763f537c1e5 (patch)
tree8949e9f56ce669d90c4b2ac8eb8b9760c7d95aca /scripts/rabbitmq-server
parent3d568701e733dfb07d9a61390c192364ad4ce68a (diff)
parentcbbcc3e32f97b6047b4f82f0776717dd3e85430c (diff)
downloadrabbitmq-server-git-5f7553c0bd2eac3fc311761bc2b81763f537c1e5.tar.gz
Merge branch 'master' into rabbitmq-server-567
Diffstat (limited to 'scripts/rabbitmq-server')
-rwxr-xr-xscripts/rabbitmq-server7
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index cd56b67d73..b5e36daeea 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -109,6 +109,10 @@ if [ ! -d ${RABBITMQ_SCHEMA_DIR} ]; then
mkdir -p "${RABBITMQ_SCHEMA_DIR}"
fi
+if [ ! -d ${RABBITMQ_GENERATED_CONFIG_DIR} ]; then
+ mkdir -p "${RABBITMQ_GENERATED_CONFIG_DIR}"
+fi
+
if [ ! -f "${RABBITMQ_SCHEMA_DIR}/rabbitmq.schema" ]; then
cp "${RABBITMQ_HOME}/priv/schema/rabbitmq.schema" "${RABBITMQ_SCHEMA_DIR}"
fi
@@ -164,7 +168,7 @@ else
fi
# Bump ETS table limit to 50000
-if ["x" = "x$ERL_MAX_ETS_TABLES"]; then
+if [ "x" = "x$ERL_MAX_ETS_TABLES" ]; then
ERL_MAX_ETS_TABLES=50000
fi
@@ -217,7 +221,6 @@ start_rabbitmq_server() {
-rabbit lager_handler_upgrade "$RABBITMQ_LAGER_HANDLER_UPGRADE" \
-rabbit enabled_plugins_file "\"$RABBITMQ_ENABLED_PLUGINS_FILE\"" \
-rabbit plugins_dir "\"$RABBITMQ_PLUGINS_DIR\"" \
- -rabbit plugins_expand_dir "\"$RABBITMQ_PLUGINS_EXPAND_DIR\"" \
-os_mon start_cpu_sup false \
-os_mon start_disksup false \
-os_mon start_memsup false \