summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorDiana Corbacho <diana@rabbitmq.com>2019-07-04 13:01:57 +0100
committerDiana Corbacho <diana@rabbitmq.com>2019-07-04 13:01:57 +0100
commitf1fe6001f2fa0a28d59ebd5a6197c38753a7b4c6 (patch)
tree645e91bdacbe3f2345bbf4e2db965b9824675a91 /src/rabbit.erl
parent2170396194b3c0cbab6146d508f7bd5e669bdc39 (diff)
parent33a7f97c4a471541adf05368d92862af4087c4a2 (diff)
downloadrabbitmq-server-git-f1fe6001f2fa0a28d59ebd5a6197c38753a7b4c6.tar.gz
Merge branch 'master' into qq-sync-op-fixes
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r--src/rabbit.erl17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index d65c4ef24b..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]).
@@ -1123,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