summaryrefslogtreecommitdiff
path: root/scripts/rabbitmq-server
diff options
context:
space:
mode:
authorsylvainhubsch <sylvain.hubsch@gmail.com>2016-06-05 15:56:12 -0700
committersylvainhubsch <sylvain.hubsch@gmail.com>2016-06-05 15:56:12 -0700
commit60db6956798b8dbbb664ba4c61080faad9f12441 (patch)
treeccb7705db4da7be7c4ca6ea2f10b9ea84dff6e34 /scripts/rabbitmq-server
parent8b9a54c5cae6541dadef021f35abc50b84b6cf96 (diff)
parent2b4df8a8382b9cd62d23165409754b54c5fab2ca (diff)
downloadrabbitmq-server-git-60db6956798b8dbbb664ba4c61080faad9f12441.tar.gz
Merge remote-tracking branch 'upstream/master' into rabbitmq-server-xh-notypeandshortcuts
Diffstat (limited to 'scripts/rabbitmq-server')
-rwxr-xr-xscripts/rabbitmq-server6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 8a6279dc65..6d82588ee2 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -171,11 +171,15 @@ ensure_thread_pool_size() {
}
start_rabbitmq_server() {
+ # "-pa ${RABBITMQ_SERVER_CODE_PATH}" should be the very first
+ # command-line argument. In case of using cached HiPE-compilation,
+ # this will allow for compiled versions of erlang built-in modules
+ # (e.g. lists) to be loaded.
ensure_thread_pool_size
check_start_params &&
RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \
exec ${ERL_DIR}erl \
- -pa ${RABBITMQ_EBIN_ROOT} \
+ -pa ${RABBITMQ_SERVER_CODE_PATH} ${RABBITMQ_EBIN_ROOT} \
${RABBITMQ_START_RABBIT} \
${RABBITMQ_NAME_TYPE} ${RABBITMQ_NODENAME} \
-boot "${SASL_BOOT_FILE}" \