summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2011-09-20 16:01:55 +0100
committerAlexandru Scvortov <alexandru@rabbitmq.com>2011-09-20 16:01:55 +0100
commitb39f33cb61320c07968b7c0ecb345af3fc7bdd8c (patch)
tree69dfdb57cd05bea669513c47738b2e30cddc2498 /scripts
parent38d108f164be01c93d6584df5d2a8e42b675d46f (diff)
downloadrabbitmq-server-git-b39f33cb61320c07968b7c0ecb345af3fc7bdd8c.tar.gz
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).
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/rabbitmq-server1
-rw-r--r--scripts/rabbitmq-server.bat1
-rw-r--r--scripts/rabbitmq-service.bat1
3 files changed, 0 insertions, 3 deletions
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 ^