diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-06-02 14:54:44 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-06-02 14:54:44 +0300 |
| commit | 1ca18072ac3c036e89069733a10f957b0f6df707 (patch) | |
| tree | e5e50c26e4aca77de4778f6385bd161354b659da /scripts | |
| parent | 270997fd46286aa69c9da5fb30124f8e93bc7512 (diff) | |
| parent | 45641a62675b1b67b01a5db76056a7d22de68175 (diff) | |
| download | rabbitmq-server-git-1ca18072ac3c036e89069733a10f957b0f6df707.tar.gz | |
Merge branch 'master' into rabbitmq-delayed-message-exchange-3
Diffstat (limited to 'scripts')
| -rwxr-xr-x[-rw-r--r--] | scripts/rabbitmq-env | 1 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index b59e323e66..62cff0b248 100644..100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -177,6 +177,7 @@ DEFAULT_NODE_PORT=5672 [ "x" = "x$RABBITMQ_MNESIA_BASE" ] && RABBITMQ_MNESIA_BASE=${MNESIA_BASE} [ "x" = "x$RABBITMQ_SERVER_START_ARGS" ] && RABBITMQ_SERVER_START_ARGS=${SERVER_START_ARGS} [ "x" = "x$RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS" ] && RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=${SERVER_ADDITIONAL_ERL_ARGS} +[ "x" = "x$RABBITMQ_SERVER_CODE_PATH" ] && RABBITMQ_SERVER_CODE_PATH=${SERVER_CODE_PATH} [ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${MNESIA_DIR} [ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME} [ "x" = "x$RABBITMQ_GENERATED_CONFIG_DIR" ] && RABBITMQ_GENERATED_CONFIG_DIR=${GENERATED_CONFIG_DIR} 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}" \ |