summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xscripts/rabbitmq-server1
-rw-r--r--scripts/rabbitmq-server.bat1
-rw-r--r--src/rabbit.erl17
-rw-r--r--src/rabbit_tests.erl39
4 files changed, 32 insertions, 26 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index e33ae733e9..413d0b4cdc 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -102,6 +102,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 a7c9c973b4..aec323dafc 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -144,6 +144,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/src/rabbit.erl b/src/rabbit.erl
index a537ce7502..a4b01695d6 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -244,12 +244,14 @@ environment() ->
rotate_logs(BinarySuffix) ->
Suffix = binary_to_list(BinarySuffix),
- log_rotation_result(rotate_logs(log_location(kernel),
+ R = log_rotation_result(rotate_logs(log_location(kernel),
Suffix,
rabbit_error_logger_file_h),
rotate_logs(log_location(sasl),
Suffix,
- rabbit_sasl_report_file_h)).
+ rabbit_sasl_report_file_h)),
+ io:format("Rot Handlers: ~p~n", [gen_event:which_handlers(error_logger)]),
+ R.
%%--------------------------------------------------------------------
@@ -441,18 +443,21 @@ insert_default_data() ->
ensure_working_log_handlers() ->
Handlers = gen_event:which_handlers(error_logger),
- ok = ensure_working_log_handler(rabbit_error_logger_file_h,
+ ok = ensure_working_log_handler(error_logger_file_h,
+ rabbit_error_logger_file_h,
error_logger_tty_h,
log_location(kernel),
Handlers),
- ok = ensure_working_log_handler(rabbit_sasl_report_file_h,
+ ok = ensure_working_log_handler(sasl_report_file_h,
+ rabbit_sasl_report_file_h,
sasl_report_tty_h,
log_location(sasl),
Handlers),
error_logger:delete_report_handler(error_logger_tty_h),
ok.
-ensure_working_log_handler(NewFHandler, TTYHandler, LogLocation, Handlers) ->
+ensure_working_log_handler(OldFHandler, NewFHandler, TTYHandler, LogLocation,
+ Handlers) ->
case LogLocation of
undefined -> ok;
tty -> case lists:member(TTYHandler, Handlers) of
@@ -464,7 +469,7 @@ ensure_working_log_handler(NewFHandler, TTYHandler, LogLocation, Handlers) ->
_ -> case lists:member(NewFHandler, Handlers) of
true -> ok;
false -> case rotate_logs(LogLocation, "",
- NewFHandler) of
+ OldFHandler, NewFHandler) of
ok -> ok;
{error, Reason} ->
throw({error, {cannot_log_to_file,
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index a683251b60..f4929c24af 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -35,20 +35,20 @@ test_content_prop_roundtrip(Datum, Binary) ->
Binary = rabbit_binary_generator:encode_properties(Types, Values). %% assertion
all_tests() ->
- %% passed = gm_tests:all_tests(),
- %% application:set_env(rabbit, file_handles_high_watermark, 10, infinity),
- %% ok = file_handle_cache:set_limit(10),
- %% passed = test_file_handle_cache(),
- %% passed = test_backing_queue(),
- %% passed = test_priority_queue(),
- %% passed = test_bpqueue(),
- %% passed = test_pg_local(),
- %% passed = test_unfold(),
- %% passed = test_supervisor_delayed_restart(),
- %% passed = test_parsing(),
- %% passed = test_content_framing(),
- %% passed = test_content_transcoding(),
- %% passed = test_topic_matching(),
+ passed = gm_tests:all_tests(),
+ application:set_env(rabbit, file_handles_high_watermark, 10, infinity),
+ ok = file_handle_cache:set_limit(10),
+ passed = test_file_handle_cache(),
+ passed = test_backing_queue(),
+ passed = test_priority_queue(),
+ passed = test_bpqueue(),
+ passed = test_pg_local(),
+ passed = test_unfold(),
+ passed = test_supervisor_delayed_restart(),
+ passed = test_parsing(),
+ passed = test_content_framing(),
+ passed = test_content_transcoding(),
+ passed = test_topic_matching(),
passed = test_log_management(),
passed = test_app_management(),
passed = test_log_management_during_startup(),
@@ -822,8 +822,6 @@ test_log_management() ->
%% cleanup
ok = application:set_env(rabbit, sasl_error_logger, {file, SaslLog}),
ok = application:set_env(rabbit, error_logger, {file, MainLog}),
- ok = add_log_handlers([{rabbit_error_logger_file_h, MainLog},
- {rabbit_sasl_report_file_h, SaslLog}]),
passed.
test_log_management_during_startup() ->
@@ -850,13 +848,13 @@ test_log_management_during_startup() ->
end,
%% fix sasl logging
- ok = application:set_env(rabbit, sasl_error_logger,
- {file, SaslLog}),
+ ok = application:unset_env(sasl, sasl_error_logger),
+ ok = application:set_env(rabbit, sasl_error_logger, {file, SaslLog}),
%% start application with logging to non-existing directory
TmpLog = "/tmp/rabbit-tests/test.log",
delete_file(TmpLog),
- ok = application:set_env(rabbit, error_logger, {file, TmpLog}),
+ ok = application:set_env(kernel, error_logger, {file, TmpLog}),
ok = delete_log_handlers([rabbit_error_logger_file_h]),
ok = add_log_handlers([{error_logger_file_h, MainLog}]),
@@ -877,7 +875,7 @@ test_log_management_during_startup() ->
%% start application with logging to a subdirectory which
%% parent directory has no write permissions
TmpTestDir = "/tmp/rabbit-tests/no-permission/test/log",
- ok = application:set_env(rabbit, error_logger, {file, TmpTestDir}),
+ ok = application:set_env(kernel, error_logger, {file, TmpTestDir}),
ok = add_log_handlers([{error_logger_file_h, MainLog}]),
ok = case control_action(start_app, []) of
ok -> exit({got_success_but_expected_failure,
@@ -892,6 +890,7 @@ test_log_management_during_startup() ->
%% start application with standard error_logger_file_h
%% handler not installed
+ ok = application:unset_env(kernel, error_logger),
ok = application:set_env(rabbit, error_logger, {file, MainLog}),
ok = control_action(start_app, []),
ok = control_action(stop_app, []),
View Lorry Controller Status