chore: fix elvis warnings
This commit is contained in:
parent
34cc8cc7f5
commit
5d4604701c
|
@ -62,6 +62,8 @@
|
||||||
, call_fold/3
|
, call_fold/3
|
||||||
]).
|
]).
|
||||||
|
|
||||||
|
-elvis([{elvis_style, god_modules, disable}]).
|
||||||
|
|
||||||
%%--------------------------------------------------------------------
|
%%--------------------------------------------------------------------
|
||||||
%% Clients
|
%% Clients
|
||||||
%%--------------------------------------------------------------------
|
%%--------------------------------------------------------------------
|
||||||
|
@ -340,11 +342,7 @@ merge_responsed_bool(_Req, #{type := 'IGNORE'}) ->
|
||||||
ignore;
|
ignore;
|
||||||
merge_responsed_bool(Req, #{type := Type, value := {bool_result, NewBool}})
|
merge_responsed_bool(Req, #{type := Type, value := {bool_result, NewBool}})
|
||||||
when is_boolean(NewBool) ->
|
when is_boolean(NewBool) ->
|
||||||
NReq = Req#{result => NewBool},
|
{ret(Type), Req#{result => NewBool}};
|
||||||
case Type of
|
|
||||||
'CONTINUE' -> {ok, NReq};
|
|
||||||
'STOP_AND_RETURN' -> {stop, NReq}
|
|
||||||
end;
|
|
||||||
merge_responsed_bool(_Req, Resp) ->
|
merge_responsed_bool(_Req, Resp) ->
|
||||||
?SLOG(warning, #{msg => "unknown_responsed_value", resp => Resp}),
|
?SLOG(warning, #{msg => "unknown_responsed_value", resp => Resp}),
|
||||||
ignore.
|
ignore.
|
||||||
|
@ -352,11 +350,10 @@ merge_responsed_bool(_Req, Resp) ->
|
||||||
merge_responsed_message(_Req, #{type := 'IGNORE'}) ->
|
merge_responsed_message(_Req, #{type := 'IGNORE'}) ->
|
||||||
ignore;
|
ignore;
|
||||||
merge_responsed_message(Req, #{type := Type, value := {message, NMessage}}) ->
|
merge_responsed_message(Req, #{type := Type, value := {message, NMessage}}) ->
|
||||||
NReq = Req#{message => NMessage},
|
{ret(Type), Req#{message => NMessage}};
|
||||||
case Type of
|
|
||||||
'CONTINUE' -> {ok, NReq};
|
|
||||||
'STOP_AND_RETURN' -> {stop, NReq}
|
|
||||||
end;
|
|
||||||
merge_responsed_message(_Req, Resp) ->
|
merge_responsed_message(_Req, Resp) ->
|
||||||
?SLOG(warning, #{msg => "unknown_responsed_value", resp => Resp}),
|
?SLOG(warning, #{msg => "unknown_responsed_value", resp => Resp}),
|
||||||
ignore.
|
ignore.
|
||||||
|
|
||||||
|
ret('CONTINUE') -> ok;
|
||||||
|
ret('STOP_AND_RETURN') -> stop.
|
||||||
|
|
|
@ -141,7 +141,7 @@ load_all_servers(Servers, ReqOpts) ->
|
||||||
load_all_servers(Servers, ReqOpts, #{}, #{}).
|
load_all_servers(Servers, ReqOpts, #{}, #{}).
|
||||||
load_all_servers([], _Request, Waiting, Running) ->
|
load_all_servers([], _Request, Waiting, Running) ->
|
||||||
{Waiting, Running};
|
{Waiting, Running};
|
||||||
load_all_servers([#{name := Name0} = Options0|More], ReqOpts, Waiting, Running) ->
|
load_all_servers([#{name := Name0} = Options0 | More], ReqOpts, Waiting, Running) ->
|
||||||
Name = iolist_to_binary(Name0),
|
Name = iolist_to_binary(Name0),
|
||||||
Options = Options0#{name => Name},
|
Options = Options0#{name => Name},
|
||||||
{NWaiting, NRunning} =
|
{NWaiting, NRunning} =
|
||||||
|
|
|
@ -75,6 +75,8 @@
|
||||||
|
|
||||||
-dialyzer({nowarn_function, [inc_metrics/2]}).
|
-dialyzer({nowarn_function, [inc_metrics/2]}).
|
||||||
|
|
||||||
|
-elvis([{elvis_style, dont_repeat_yourself, disable}]).
|
||||||
|
|
||||||
%%--------------------------------------------------------------------
|
%%--------------------------------------------------------------------
|
||||||
%% Load/Unload APIs
|
%% Load/Unload APIs
|
||||||
%%--------------------------------------------------------------------
|
%%--------------------------------------------------------------------
|
||||||
|
@ -178,16 +180,19 @@ resolve_hookspec(HookSpecs) when is_list(HookSpecs) ->
|
||||||
case maps:get(name, HookSpec, undefined) of
|
case maps:get(name, HookSpec, undefined) of
|
||||||
undefined -> Acc;
|
undefined -> Acc;
|
||||||
Name0 ->
|
Name0 ->
|
||||||
Name = try binary_to_existing_atom(Name0, utf8) catch T:R:_ -> {T,R} end,
|
Name = try
|
||||||
case lists:member(Name, AvailableHooks) of
|
binary_to_existing_atom(Name0, utf8)
|
||||||
true ->
|
catch T:R:_ -> {T,R}
|
||||||
case lists:member(Name, MessageHooks) of
|
end,
|
||||||
true ->
|
case {lists:member(Name, AvailableHooks),
|
||||||
Acc#{Name => #{topics => maps:get(topics, HookSpec, [])}};
|
lists:member(Name, MessageHooks)} of
|
||||||
_ ->
|
{false, _} ->
|
||||||
Acc#{Name => #{}}
|
error({unknown_hookpoint, Name});
|
||||||
end;
|
{true, false} ->
|
||||||
_ -> error({unknown_hookpoint, Name})
|
Acc#{Name => #{}};
|
||||||
|
{true, true} ->
|
||||||
|
Acc#{Name => #{
|
||||||
|
topics => maps:get(topics, HookSpec, [])}}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end, #{}, HookSpecs).
|
end, #{}, HookSpecs).
|
||||||
|
@ -260,7 +265,7 @@ call(Hookpoint, Req, #server{name = ChannName, options = ReqOpts,
|
||||||
%% @private
|
%% @private
|
||||||
inc_metrics(IncFun, Name) when is_function(IncFun) ->
|
inc_metrics(IncFun, Name) when is_function(IncFun) ->
|
||||||
%% BACKW: e4.2.0-e4.2.2
|
%% BACKW: e4.2.0-e4.2.2
|
||||||
{env, [Prefix|_]} = erlang:fun_info(IncFun, env),
|
{env, [Prefix | _]} = erlang:fun_info(IncFun, env),
|
||||||
inc_metrics(Prefix, Name);
|
inc_metrics(Prefix, Name);
|
||||||
inc_metrics(Prefix, Name) when is_list(Prefix) ->
|
inc_metrics(Prefix, Name) when is_list(Prefix) ->
|
||||||
emqx_metrics:inc(list_to_atom(Prefix ++ atom_to_list(Name))).
|
emqx_metrics:inc(list_to_atom(Prefix ++ atom_to_list(Name))).
|
||||||
|
|
Loading…
Reference in New Issue