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-env | |
| 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-env')
| -rw-r--r-- | scripts/rabbitmq-env | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 0014643260..e4f89e2658 100644 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -210,13 +210,11 @@ rmq_normalize_path_var RABBITMQ_PLUGINS_DIR ## Log rotation [ "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_SASL_LOGS" ] && RABBITMQ_SASL_LOGS=${SASL_LOGS} -[ "x" = "x$RABBITMQ_SASL_LOGS" ] && RABBITMQ_SASL_LOGS="${RABBITMQ_LOG_BASE}/${RABBITMQ_NODENAME}-sasl.log" rmq_normalize_path_var \ - RABBITMQ_LOGS \ - RABBITMQ_SASL_LOGS + RABBITMQ_LOGS [ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS} @@ -232,8 +230,7 @@ rmq_check_if_shared_with_mnesia \ RABBITMQ_PLUGINS_EXPAND_DIR \ RABBITMQ_ENABLED_PLUGINS_FILE \ RABBITMQ_PLUGINS_DIR \ - RABBITMQ_LOGS \ - RABBITMQ_SASL_LOGS + RABBITMQ_LOGS ##--- End of overridden <var_name> variables |