diff options
| author | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2016-12-27 16:36:08 +0100 |
|---|---|---|
| committer | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2016-12-27 16:36:08 +0100 |
| commit | 6a016d5b5db291ab0a99edbc794fc7ab45299c24 (patch) | |
| tree | a0259dc7303308073d6db3aa5c1e52dd58d252dd /scripts/rabbitmq-server | |
| parent | 6afabee7738c5e56ebf9638101f11b6be728afaf (diff) | |
| parent | 30ebac8cc103cf032d5e7bdd1b5f74407f4b986f (diff) | |
| download | rabbitmq-server-git-6a016d5b5db291ab0a99edbc794fc7ab45299c24.tar.gz | |
Merge branch 'master' into rabbitmq-server-505
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index ce731516d4..41d1a81332 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -155,14 +155,16 @@ RABBITMQ_LISTEN_ARG= [ "x" != "x$RABBITMQ_NODE_PORT" ] && [ "x" != "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_LISTEN_ARG="-rabbit tcp_listeners [{\""${RABBITMQ_NODE_IP_ADDRESS}"\","${RABBITMQ_NODE_PORT}"}]" # If $RABBITMQ_LOGS is '-', send all log messages to stdout. This is -# particularily useful for Docker images. +# particularly useful for Docker images. 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,8 +218,10 @@ 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\"" \ -os_mon start_cpu_sup false \ -os_mon start_disksup false \ -os_mon start_memsup false \ |