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

refactor(limiter): not saving anonymous function

This commit is contained in:
JianBo He 2020-12-02 14:07:55 +08:00 committed by turtleDeng
parent a3cdae3b42
commit 40d272815a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/emqx_limiter.erl
View File

@ -35,7 +35,7 @@
-type(checker() :: #{ name := name() -type(checker() :: #{ name := name()
, capacity := non_neg_integer() , capacity := non_neg_integer()
, interval := non_neg_integer() , interval := non_neg_integer()
, consumer := function() | esockd_rate_limit:bucket() , consumer := esockd_rate_limit:bucket() | emqx_zone:zone()
}). }).
-type(name() :: conn_bytes_in -type(name() :: conn_bytes_in
@ -84,7 +84,7 @@ do_init_checker(Zone, {Name, {Capacity, Interval}}) ->
_ -> _ ->
esockd_limiter:create({Zone, Name}, Capacity, Interval) esockd_limiter:create({Zone, Name}, Capacity, Interval)
end, end,
Ck#{consumer => fun(I) -> esockd_limiter:consume({Zone, Name}, I) end}; Ck#{consumer => Zone};
_ -> _ ->
Ck#{consumer => esockd_rate_limit:new(Capacity / Interval, Capacity)} Ck#{consumer => esockd_rate_limit:new(Capacity / Interval, Capacity)}
end. end.
@ -126,7 +126,13 @@ consume(Pubs, Bytes, #{name := Name, consumer := Cons}) ->
_ -> _ ->
case is_overall_limiter(Name) of case is_overall_limiter(Name) of
true -> true ->
{_, Intv} = Cons(Tokens), {_, Intv} = case erlang:is_function(Cons) of
true -> %% Compatible with hot-upgrade from e4.2.0, e4.2.1.
%% It should be removed after 4.3.0
{env, [Zone|_]} = erlang:fun_info(Cons, env),
esockd_limiter:consume({Zone, Name}, Tokens);
_ -> esockd_limiter:consume({Cons, Name}, Tokens)
end,
{Intv, Cons}; {Intv, Cons};
_ -> _ ->
esockd_rate_limit:check(Tokens, Cons) esockd_rate_limit:check(Tokens, Cons)