From b39f33cb61320c07968b7c0ecb345af3fc7bdd8c Mon Sep 17 00:00:00 2001
From: Alexandru Scvortov <alexandru@rabbitmq.com>
Date: Tue, 20 Sep 2011 16:01:55 +0100
Subject: reorder boot script so that rabbit:prepare/0 gets called *after* sasl
 is started

Otherwise, the SASL application is started after and installs its error
handlers (which prepare should have replaced).
---
 scripts/rabbitmq-server      | 1 -
 scripts/rabbitmq-server.bat  | 1 -
 scripts/rabbitmq-service.bat | 1 -
 3 files changed, 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index deca5b3042..937746fc51 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -106,7 +106,6 @@ exec erl \
     ${RABBITMQ_SERVER_ERL_ARGS} \
     ${RABBITMQ_LISTEN_ARG} \
     -sasl errlog_type error \
-    -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 \
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 3049f22d23..20db55ee3e 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -135,7 +135,6 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (
 -rabbit error_logger {file,\""!LOGS:\=/!"\"} ^
 !RABBITMQ_SERVER_ERL_ARGS! ^
 -sasl errlog_type error ^
--sasl sasl_error_logger false ^
 -rabbit sasl_error_logger {file,\""!SASL_LOGS:\=/!"\"} ^
 -os_mon start_cpu_sup true ^
 -os_mon start_disksup false ^
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index db9b958e54..36308777f8 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -201,7 +201,6 @@ set ERLANG_SERVICE_ARGUMENTS= ^
 -rabbit error_logger {file,\""!LOGS:\=/!"\"} ^
 !RABBITMQ_SERVER_ERL_ARGS! ^
 -sasl errlog_type error ^
--sasl sasl_error_logger false ^
 -rabbit sasl_error_logger {file,\""!SASL_LOGS:\=/!"\"} ^
 -os_mon start_cpu_sup true ^
 -os_mon start_disksup false ^
-- 
cgit v1.2.1