diff options
| author | Michael Klishin <michael@novemberain.com> | 2016-12-24 04:09:12 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-24 04:09:12 +0300 |
| commit | fdf783f9accd0b7c914b17907c0d7528750fb961 (patch) | |
| tree | 816a802958e13515f158b8d52d0f6dfd69dc839d /scripts | |
| parent | 72f7c8e70028209ee1c58074c087b4d0cb901e6c (diff) | |
| parent | 1d4e939b84b56dd793bd265bec074a392cdf194b (diff) | |
| download | rabbitmq-server-git-fdf783f9accd0b7c914b17907c0d7528750fb961.tar.gz | |
Merge pull request #766 from rabbitmq/rabbitmq-server-567
Per vhost message store
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-env | 9 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index d975f274b2..f1624eddf9 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -236,9 +236,11 @@ rmq_normalize_path_var RABBITMQ_PLUGINS_DIR [ "x" = "x$RABBITMQ_LOGS" ] && RABBITMQ_LOGS=${LOGS} [ "x" != "x$RABBITMQ_LOGS" ] && export RABBITMQ_LOGS_source=environment [ "x" = "x$RABBITMQ_LOGS" ] && RABBITMQ_LOGS="${RABBITMQ_LOG_BASE}/${RABBITMQ_NODENAME}.log" +[ "x" = "x$RABBITMQ_UPGRADE_LOG" ] && RABBITMQ_UPGRADE_LOG="${RABBITMQ_LOG_BASE}/${RABBITMQ_NODENAME}_upgrade.log" -rmq_normalize_path_var \ - RABBITMQ_LOGS +rmq_normalize_path_var RABBITMQ_LOGS + +rmq_normalize_path_var RABBITMQ_UPGRADE_LOG [ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS} @@ -254,7 +256,8 @@ rmq_check_if_shared_with_mnesia \ RABBITMQ_PLUGINS_EXPAND_DIR \ RABBITMQ_ENABLED_PLUGINS_FILE \ RABBITMQ_PLUGINS_DIR \ - RABBITMQ_LOGS + RABBITMQ_LOGS \ + RABBITMQ_UPGRADE_LOG ##--- End of overridden <var_name> variables diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 6f1e932da2..b647e9091c 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -160,9 +160,11 @@ RABBITMQ_LISTEN_ARG= if [ "$RABBITMQ_LOGS" = '-' ]; then SASL_ERROR_LOGGER=tty RABBIT_LAGER_HANDLER=tty + RABBITMQ_LAGER_HANDLER_UPGRADE=tty else SASL_ERROR_LOGGER=false RABBIT_LAGER_HANDLER='"'${RABBITMQ_LOGS}'"' + RABBITMQ_LAGER_HANDLER_UPGRADE='"'${RABBITMQ_UPGRADE_LOG}'"' fi # Bump ETS table limit to 50000 @@ -216,6 +218,7 @@ start_rabbitmq_server() { -sasl sasl_error_logger "$SASL_ERROR_LOGGER" \ -rabbit lager_log_root "\"$RABBITMQ_LOG_BASE\"" \ -rabbit lager_handler "$RABBIT_LAGER_HANDLER" \ + -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\"" \ |