Skip to content
This repository was archived by the owner on Nov 17, 2020. It is now read-only.

Stop emitting stats before hibernate on gen_server2 #197

Merged
merged 2 commits into from
May 18, 2017
Merged

Stop emitting stats before hibernate on gen_server2 #197

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
157d044
Stop emitting stats before hibernate on gen_server2
dcorbacho May 17, 2017
0543b47
Stop stats only if they have been initialised
dcorbacho May 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/gen_server2.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,8 +708,9 @@ hibernate(GS2State = #gs2_state { timeout_state = TimeoutState }) ->
proc_lib:hibernate(?MODULE, wake_hib,
[GS2State #gs2_state { timeout_state = TS }]).

pre_hibernate(GS2State = #gs2_state { state = State,
mod = Mod }) ->
pre_hibernate(GS2State0 = #gs2_state { state = State,
mod = Mod }) ->
GS2State = maybe_stop_stats(GS2State0),
case erlang:function_exported(Mod, handle_pre_hibernate, 1) of
true ->
case catch Mod:handle_pre_hibernate(State) of
Expand All @@ -722,8 +723,10 @@ pre_hibernate(GS2State = #gs2_state { state = State,
hibernate(GS2State)
end.

post_hibernate(GS2State = #gs2_state { state = State,
mod = Mod }) ->
post_hibernate(GS2State0 = #gs2_state { state = State,
mod = Mod,
init_stats_fun = InitStatsFun }) ->
GS2State = InitStatsFun(GS2State0),
case erlang:function_exported(Mod, handle_post_hibernate, 1) of
true ->
case catch Mod:handle_post_hibernate(State) of
Expand Down Expand Up @@ -1381,5 +1384,10 @@ emit_stats(GS2State = #gs2_state{queue = Queue}) ->
#gs2_state.timer, emit_gen_server2_stats).

stop_stats(GS2State) ->
_ = rabbit_event:stop_stats_timer(GS2State, #gs2_state.timer),
maybe_stop_stats(GS2State),
rabbit_core_metrics:gen_server2_deleted(self()).

maybe_stop_stats(#gs2_state{timer = undefined} = GS2State) ->
GS2State;
maybe_stop_stats(GS2State) ->
rabbit_event:stop_stats_timer(GS2State, #gs2_state.timer).