diff options
| author | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2016-01-13 12:23:38 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr> | 2016-01-13 12:23:38 +0100 |
| commit | 7c98f51b6c52d5b819317c7b4b249641417d2bb6 (patch) | |
| tree | 900bd93590e80e0f6ee839e44a890063505ec1f8 /scripts/rabbitmq-server | |
| parent | 636142506ccf1fb65058fe0ae8d997edcc25af65 (diff) | |
| parent | 670d986641cebf3db4d24c4c18b0cbc8132a9829 (diff) | |
| download | rabbitmq-server-git-7c98f51b6c52d5b819317c7b4b249641417d2bb6.tar.gz | |
Merge pull request #491 from rabbitmq/rabbitmq-server-94rabbitmq_v3_7_0_milestone1
Switch to Lager for logging
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 69c2b7ff6c..303383eb1b 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -76,22 +76,15 @@ RABBITMQ_CONFIG_ARG= 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. Likewise -# for RABBITMQ_SASL_LOGS. This is particularily useful for Docker -# images. +# If $RABBITMQ_LOGS is '-', send all log messages to stdout. This is +# particularily useful for Docker images. if [ "$RABBITMQ_LOGS" = '-' ]; then - RABBIT_ERROR_LOGGER='tty' -else - RABBIT_ERROR_LOGGER='{file,"'${RABBITMQ_LOGS}'"}' -fi - -if [ "$RABBITMQ_SASL_LOGS" = '-' ]; then SASL_ERROR_LOGGER=tty - RABBIT_SASL_ERROR_LOGGER='tty' + RABBIT_LAGER_HANDLER=tty else SASL_ERROR_LOGGER=false - RABBIT_SASL_ERROR_LOGGER='{file,"'${RABBITMQ_SASL_LOGS}'"}' + RABBIT_LAGER_HANDLER='"'${RABBITMQ_LOGS}'"' fi # we need to turn off path expansion because some of the vars, notably @@ -116,8 +109,8 @@ start_rabbitmq_server() { ${RABBITMQ_LISTEN_ARG} \ -sasl errlog_type error \ -sasl sasl_error_logger "$SASL_ERROR_LOGGER" \ - -rabbit error_logger "$RABBIT_ERROR_LOGGER" \ - -rabbit sasl_error_logger "$RABBIT_SASL_ERROR_LOGGER" \ + -rabbit lager_log_root "\"$RABBITMQ_LOG_BASE\"" \ + -rabbit lager_handler "$RABBIT_LAGER_HANDLER" \ -rabbit enabled_plugins_file "\"$RABBITMQ_ENABLED_PLUGINS_FILE\"" \ -rabbit plugins_dir "\"$RABBITMQ_PLUGINS_DIR\"" \ -rabbit plugins_expand_dir "\"$RABBITMQ_PLUGINS_EXPAND_DIR\"" \ |