yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(topic-metrics): fix the issue that the corresponding data is not properly cleaned up when unregistering (#3679)

This commit is contained in:
tigercl 2020-08-22 09:59:55 +08:00
parent f47e10e08a
commit 901573c6a5
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/emqx_mod_topic_metrics.erl
View File

@ -247,7 +247,10 @@ handle_call({unregister, Topic}, _From, State = #state{speeds = Speeds}) ->
{reply, ok, State}; {reply, ok, State};
true -> true ->
ok = delete_counters(Topic), ok = delete_counters(Topic),
{reply, ok, State#state{speeds = maps:remove(Topic, Speeds)}} NSpeeds = lists:foldl(fun(Metric, Acc) ->
maps:remove({Topic, Metric}, Acc)
end, Speeds, ?TOPIC_METRICS),
{reply, ok, State#state{speeds = NSpeeds}}
end; end;
handle_call({get_rate, Topic, Metric}, _From, State = #state{speeds = Speeds}) -> handle_call({get_rate, Topic, Metric}, _From, State = #state{speeds = Speeds}) ->
@ -271,7 +274,7 @@ handle_info(ticking, State = #state{speeds = Speeds}) ->
NSpeeds = maps:map( NSpeeds = maps:map(
fun({Topic, Metric}, Speed) -> fun({Topic, Metric}, Speed) ->
case val(Topic, Metric) of case val(Topic, Metric) of
{error, topic_not_found} -> maps:remove(Topic, Speeds); {error, topic_not_found} -> maps:remove({Topic, Metric}, Speeds);
Val -> calculate_speed(Val, Speed) Val -> calculate_speed(Val, Speed)
end end
end, Speeds), end, Speeds),