summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r--src/rabbit.erl23
1 files changed, 13 insertions, 10 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 4a974fd682..fdf2138515 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -33,8 +33,6 @@
-export([log_locations/0, config_files/0, decrypt_config/2]). %% for testing and mgmt-agent
-export([is_booted/1, is_booted/0, is_booting/1, is_booting/0]).
--deprecated([{force_event_refresh, 1, eventually}]).
-
-ifdef(TEST).
-export([start_logger/0]).
@@ -539,6 +537,12 @@ start_loaded_apps(Apps, RestartTypes) ->
application:set_env(ra, logger_module, rabbit_log_ra_shim),
%% use a larger segments size for queues
application:set_env(ra, segment_max_entries, 32768),
+ case application:get_env(ra, wal_max_size_bytes) of
+ undefined ->
+ application:set_env(ra, wal_max_size_bytes, 536870912); %% 5 * 2 ^ 20
+ _ ->
+ ok
+ end,
ConfigEntryDecoder = case application:get_env(rabbit, config_entry_decoder) of
undefined ->
[];
@@ -1117,17 +1121,16 @@ start_logger() ->
log_locations() ->
rabbit_lager:log_locations().
-%% This feature was used by the management API up-to and including
-%% RabbitMQ 3.7.x. It is unused in 3.8.x and thus deprecated. We keep it
-%% to support in-place upgrades to 3.8.x (i.e. mixed-version clusters).
-
-spec force_event_refresh(reference()) -> 'ok'.
+% Note: https://www.pivotaltracker.com/story/show/166962656
+% This event is necessary for the stats timer to be initialized with
+% the correct values once the management agent has started
force_event_refresh(Ref) ->
- rabbit_direct:force_event_refresh(Ref),
- rabbit_networking:force_connection_event_refresh(Ref),
- rabbit_channel:force_event_refresh(Ref),
- rabbit_amqqueue:force_event_refresh(Ref).
+ ok = rabbit_direct:force_event_refresh(Ref),
+ ok = rabbit_networking:force_connection_event_refresh(Ref),
+ ok = rabbit_channel:force_event_refresh(Ref),
+ ok = rabbit_amqqueue:force_event_refresh(Ref).
%%---------------------------------------------------------------------------
%% misc