merge default into bug24332

3 files changed, 7 insertions, 28 deletions

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 7176d80130..deca5b3042 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -59,11 +59,6 @@ fi
 [ "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"
-[ "x" = "x$RABBITMQ_BACKUP_EXTENSION" ] && RABBITMQ_BACKUP_EXTENSION=${BACKUP_EXTENSION}
-[ "x" = "x$RABBITMQ_BACKUP_EXTENSION" ] && RABBITMQ_BACKUP_EXTENSION=".1"
-
-[ -f  "${RABBITMQ_LOGS}" ] && cat "${RABBITMQ_LOGS}" >> "${RABBITMQ_LOGS}${RABBITMQ_BACKUP_EXTENSION}"
-[ -f  "${RABBITMQ_SASL_LOGS}" ] && cat "${RABBITMQ_SASL_LOGS}" >> "${RABBITMQ_SASL_LOGS}${RABBITMQ_BACKUP_EXTENSION}"
 
 RABBITMQ_START_RABBIT=
 [ "x" = "x$RABBITMQ_ALLOW_INPUT" ] && RABBITMQ_START_RABBIT='-noinput'
@@ -111,8 +106,9 @@ exec erl \
     ${RABBITMQ_SERVER_ERL_ARGS} \
     ${RABBITMQ_LISTEN_ARG} \
     -sasl errlog_type error \
-    -kernel error_logger '{file,"'${RABBITMQ_LOGS}'"}' \
-    -sasl sasl_error_logger '{file,"'${RABBITMQ_SASL_LOGS}'"}' \
+    -sasl sasl_error_logger false \
+    -rabbit error_logger '{file,"'${RABBITMQ_LOGS}'"}' \
+    -rabbit sasl_error_logger '{file,"'${RABBITMQ_SASL_LOGS}'"}' \
     -os_mon start_cpu_sup true \
     -os_mon start_disksup false \
     -os_mon start_memsup false \
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 5e2097dbe9..3049f22d23 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -70,18 +70,9 @@ if "!RABBITMQ_LOG_BASE!"=="" (
 rem We save the previous logs in their respective backup

 rem Log management (rotation, filtering based of size...) is left as an exercice for the user.

 

-set BACKUP_EXTENSION=.1

-

 set LOGS=!RABBITMQ_LOG_BASE!\!RABBITMQ_NODENAME!.log

 set SASL_LOGS=!RABBITMQ_LOG_BASE!\!RABBITMQ_NODENAME!-sasl.log

 

-if exist "!LOGS!" (

-    type "!LOGS!" >> "!LOGS!!BACKUP_EXTENSION!"

-)

-if exist "!SASL_LOGS!" (

-    type "!SASL_LOGS!" >> "!SASL_LOGS!!BACKUP_EXTENSION!"

-)

-

 rem End of log management

 

 

@@ -141,10 +132,11 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (
 +P 1048576 ^

 -kernel inet_default_connect_options "[{nodelay, true}]" ^

 !RABBITMQ_LISTEN_ARG! ^

--kernel error_logger {file,\""!LOGS:\=/!"\"} ^

+-rabbit error_logger {file,\""!LOGS:\=/!"\"} ^

 !RABBITMQ_SERVER_ERL_ARGS! ^

 -sasl errlog_type error ^

--sasl sasl_error_logger {file,\""!SASL_LOGS:\=/!"\"} ^

+-sasl sasl_error_logger false ^

+-rabbit sasl_error_logger {file,\""!SASL_LOGS:\=/!"\"} ^

 -os_mon start_cpu_sup true ^

 -os_mon start_disksup false ^

 -os_mon start_memsup false ^

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index b2aa4f58c9..614f768b19 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -103,18 +103,9 @@ if "!RABBITMQ_LOG_BASE!"=="" (
 rem We save the previous logs in their respective backup

 rem Log management (rotation, filtering based on size...) is left as an exercise for the user.

 

-set BACKUP_EXTENSION=.1

-

 set LOGS=!RABBITMQ_LOG_BASE!\!RABBITMQ_NODENAME!.log

 set SASL_LOGS=!RABBITMQ_LOG_BASE!\!RABBITMQ_NODENAME!-sasl.log

 

-if exist "!LOGS!" (

-    type "!LOGS!" >> "!LOGS!!BACKUP_EXTENSION!"

-)

-if exist "!SASL_LOGS!" (

-    type "!SASL_LOGS!" >> "!SASL_LOGS!!BACKUP_EXTENSION!"

-)

-

 rem End of log management

 

 

@@ -206,7 +197,7 @@ set ERLANG_SERVICE_ARGUMENTS= ^
 +A30 ^

 -kernel inet_default_connect_options "[{nodelay,true}]" ^

 !RABBITMQ_LISTEN_ARG! ^

--kernel error_logger {file,\""!LOGS:\=/!"\"} ^

+-rabbit error_logger {file,\""!LOGS:\=/!"\"} ^

 !RABBITMQ_SERVER_ERL_ARGS! ^

 -sasl errlog_type error ^

 -sasl sasl_error_logger {file,\""!SASL_LOGS:\=/!"\"} ^