summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2011-09-20 16:44:26 +0100
committerAlexandru Scvortov <alexandru@rabbitmq.com>2011-09-20 16:44:26 +0100
commitc00c20b3ff1dbec5442973976786773f56b5a420 (patch)
tree9d36b116aa577959ac9922de781ce84ba657254c /scripts
parentb39f33cb61320c07968b7c0ecb345af3fc7bdd8c (diff)
downloadrabbitmq-server-git-c00c20b3ff1dbec5442973976786773f56b5a420.tar.gz
Backed out changeset e24819baa47e
Because our sasl error handler will start up before the real one, for the moment, anyway.
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, 3 insertions, 0 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 937746fc51..deca5b3042 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -106,6 +106,7 @@ 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 20db55ee3e..3049f22d23 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -135,6 +135,7 @@ 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 36308777f8..db9b958e54 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -201,6 +201,7 @@ 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 ^