diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/rabbitmq-env.bat | 6 | ||||
| -rw-r--r-- | scripts/rabbitmq-server.bat | 3 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 5 |
3 files changed, 13 insertions, 1 deletions
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat index 9bf6f1cdc4..901424dfba 100644 --- a/scripts/rabbitmq-env.bat +++ b/scripts/rabbitmq-env.bat @@ -316,13 +316,17 @@ if "!RABBITMQ_LOGS!"=="" ( set RABBITMQ_LOGS=!LOGS!
)
)
-if not "!RABBITMQ_LOGS" == "-" (
+if not "!RABBITMQ_LOGS!" == "-" (
if not exist "!RABBITMQ_LOGS!" (
for /f "delims=" %%F in ("!RABBITMQ_LOGS!") do mkdir %%~dpF 2>NUL
copy /y NUL "!RABBITMQ_LOGS!" >NUL
)
for /f "delims=" %%F in ("!RABBITMQ_LOGS!") do set RABBITMQ_LOGS=%%~sF
)
+rem [ "x" = "x$RABBITMQ_UPGRADE_LOG" ] && RABBITMQ_UPGRADE_LOG="${RABBITMQ_LOG_BASE}/${RABBITMQ_NODENAME}_upgrade.log"
+if "!RABBITMQ_UPGRADE_LOG!" == "" (
+ set RABBITMQ_UPGRADE_LOG=!RABBITMQ_LOG_BASE!\!RABBITMQ_NODENAME!_upgrade.log
+)
REM [ "x" = "x$RABBITMQ_CTL_ERL_ARGS" ] && RABBITMQ_CTL_ERL_ARGS=${CTL_ERL_ARGS}
if "!$RABBITMQ_CTL_ERL_ARGS!"=="" (
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index ea417dcad4..54e60a8847 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -130,9 +130,11 @@ REM particularly useful for Docker images. if "!RABBITMQ_LOGS!" == "-" (
set SASL_ERROR_LOGGER=tty
set RABBIT_LAGER_HANDLER=tty
+ set RABBITMQ_LAGER_HANDLER_UPGRADE=tty
) else (
set SASL_ERROR_LOGGER=false
set RABBIT_LAGER_HANDLER=\""!RABBITMQ_LOGS:\=/!"\"
+ set RABBITMQ_LAGER_HANDLER_UPGRADE=\""!RABBITMQ_UPGRADE_LOG:\=/!"\"
)
set RABBITMQ_START_RABBIT=
@@ -178,6 +180,7 @@ if "!ENV_OK!"=="false" ( -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:\=/!"\" ^
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 2f118205ab..b80271bc9a 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -217,9 +217,13 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" ( )
if "!RABBITMQ_LOGS!" == "-" (
+ set SASL_ERROR_LOGGER=tty
set RABBIT_LAGER_HANDLER=tty
+ set RABBITMQ_LAGER_HANDLER_UPGRADE=tty
) else (
+ set SASL_ERROR_LOGGER=false
set RABBIT_LAGER_HANDLER=\""!RABBITMQ_LOGS:\=/!"\"
+ set RABBITMQ_LAGER_HANDLER_UPGRADE=\""!RABBITMQ_UPGRADE_LOG:\=/!"\"
)
set RABBITMQ_START_RABBIT=
@@ -255,6 +259,7 @@ set ERLANG_SERVICE_ARGUMENTS= ^ -sasl sasl_error_logger false ^
-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:\=/!"\" ^
|