diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-09-20 16:44:26 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-09-20 16:44:26 +0100 |
| commit | c00c20b3ff1dbec5442973976786773f56b5a420 (patch) | |
| tree | 9d36b116aa577959ac9922de781ce84ba657254c | |
| parent | b39f33cb61320c07968b7c0ecb345af3fc7bdd8c (diff) | |
| download | rabbitmq-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.
| -rwxr-xr-x | scripts/rabbitmq-server | 1 | ||||
| -rw-r--r-- | scripts/rabbitmq-server.bat | 1 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 1 | ||||
| -rw-r--r-- | src/rabbit_prelaunch.erl | 6 |
4 files changed, 4 insertions, 5 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 ^
diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl index f99500ddd8..9fe073d997 100644 --- a/src/rabbit_prelaunch.erl +++ b/src/rabbit_prelaunch.erl @@ -216,11 +216,7 @@ post_process_script(ScriptFile) -> end. process_entry(Entry = {apply,{application,start_boot,[mnesia,permanent]}}) -> - [{apply,{application,start_boot,[sasl,permanent]}}, - {apply,{rabbit,prepare,[]}}, - Entry]; -process_entry(Entry = {application,start_boot,[sasl,permanent]}) -> - []; + [{apply,{rabbit,prepare,[]}}, Entry]; process_entry(Entry) -> [Entry]. |