Merge branch 'master' into rabbitmq-cli-207

5 files changed, 24 insertions, 4 deletions

diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index d74a3b173a..e422557cac 100755
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -80,7 +80,7 @@ ESCRIPT_DIR="${RABBITMQ_HOME}/escript"
 DEFAULT_SCHEDULER_BIND_TYPE="db"
 [ "x" = "x$RABBITMQ_SCHEDULER_BIND_TYPE" ] && RABBITMQ_SCHEDULER_BIND_TYPE=${DEFAULT_SCHEDULER_BIND_TYPE}
 
-DEFAULT_DISTRIBUTION_BUFFER_SIZE=32000
+DEFAULT_DISTRIBUTION_BUFFER_SIZE=128000
 [ "x" = "x$RABBITMQ_DISTRIBUTION_BUFFER_SIZE" ] && RABBITMQ_DISTRIBUTION_BUFFER_SIZE=${DEFAULT_DISTRIBUTION_BUFFER_SIZE}
 
 ## Common defaults
@@ -237,6 +237,7 @@ rmq_normalize_path_var RABBITMQ_PLUGINS_DIR
 [ "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"
+[ "x" = "x$ERL_CRASH_DUMP" ] && ERL_CRASH_DUMP="${RABBITMQ_LOG_BASE}/erl_crash.dump"
 
 rmq_normalize_path_var RABBITMQ_LOGS
 
diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat
index e3fddbb3eb..335e39c2fb 100644
--- a/scripts/rabbitmq-env.bat
+++ b/scripts/rabbitmq-env.bat
@@ -38,10 +38,10 @@ if "!RABBITMQ_SCHEDULER_BIND_TYPE!"=="" (
     set RABBITMQ_SCHEDULER_BIND_TYPE=!DEFAULT_SCHEDULER_BIND_TYPE!

 )

 

-REM DEFAULT_DISTRIBUTION_BUFFER_SIZE=32000

+REM DEFAULT_DISTRIBUTION_BUFFER_SIZE=128000

 REM set the VM distribution buffer size

 REM [ "x" = "x$RABBITMQ_DISTRIBUTION_BUFFER_SIZE" ] && RABBITMQ_DISTRIBUTION_BUFFER_SIZE=${DEFAULT_DISTRIBUTION_BUFFER_SIZE}

-set DEFAULT_DISTRIBUTION_BUFFER_SIZE=32000

+set DEFAULT_DISTRIBUTION_BUFFER_SIZE=128000

 if "!RABBITMQ_DISTRIBUTION_BUFFER_SIZE!"=="" (

     set RABBITMQ_DISTRIBUTION_BUFFER_SIZE=!DEFAULT_DISTRIBUTION_BUFFER_SIZE!

 )

@@ -316,13 +316,22 @@ 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$ERL_CRASH_DUMP"] && ERL_CRASH_DUMP="${RABBITMQ_LOG_BASE}/erl_crash.dump"

+if "!ERL_CRASH_DUMP!"=="" (

+    set ERL_CRASH_DUMP=!RABBITMQ_LOG_BASE!\erl_crash.dump

+)

 

 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 b/scripts/rabbitmq-server
index d307e79138..4edec5b470 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -84,6 +84,7 @@ RABBITMQ_PRELAUNCH_NODENAME="rabbitmqprelaunch${$}@localhost"
 # success of our startup sequence to systemd.
 NOTIFY_SOCKET= \
 RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \
+ERL_CRASH_DUMP=$ERL_CRASH_DUMP \
 RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \
     ${ERL_DIR}erl -pa "$RABBITMQ_EBIN_ROOT" \
     -boot "${CLEAN_BOOT_FILE}" \
@@ -203,6 +204,7 @@ start_rabbitmq_server() {
     check_start_params &&
     RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \
     ERL_MAX_ETS_TABLES=$ERL_MAX_ETS_TABLES \
+    ERL_CRASH_DUMP=$ERL_CRASH_DUMP \
     exec ${ERL_DIR}erl \
         -pa ${RABBITMQ_SERVER_CODE_PATH} ${RABBITMQ_EBIN_ROOT} \
         ${RABBITMQ_START_RABBIT} \
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:\=/!"\" ^