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

Umbrella fix build (#3969) 

* fix(dialyzer): dialyzer warning.
This commit is contained in:
Ayodele 2021-01-04 02:10:22 +01:00 committed by GitHub
parent d86b5ef210
commit 26021b37b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_lua_hook/src/emqx_lua_hook.erl
View File

@ -196,4 +196,4 @@ do_unloadall(Scripts) ->
ok.
do_unload(Script) ->
emqx_lua_script:unregister_hooks(Script).
emqx_lua_script:unregister_hooks(Script), ok.

8
apps/emqx_management/src/emqx_mgmt_auth.erl
View File

@ -85,7 +85,7 @@ add_app(AppId, Name) when is_binary(AppId) ->
add_app(AppId, Name, Desc, Status, Expired) when is_binary(AppId) ->
add_app(AppId, Name, undefined, Desc, Status, Expired).
-spec(add_app(appid(), binary(), binary(), binary(), boolean(), integer() | undefined)
-spec(add_app(appid(), binary(), binary() | undefined, binary(), boolean(), integer() | undefined)
-> {ok, appsecret()}
| {error, term()}).
add_app(AppId, Name, Secret, Desc, Status, Expired) when is_binary(AppId) ->
@ -99,11 +99,11 @@ add_app(AppId, Name, Secret, Desc, Status, Expired) when is_binary(AppId) ->
AddFun = fun() ->
case mnesia:wread({mqtt_app, AppId}) of
[] -> mnesia:write(App);
_ -> mnesia:abort(alread_existed)
_ -> mnesia:abort(alread_existed), ok
end
end,
case mnesia:transaction(AddFun) of
{atomic, ok} -> {ok, Secret1};
{atomic, _} -> {ok, Secret1};
{aborted, Reason} -> {error, Reason}
end.
@ -138,7 +138,7 @@ get_appsecret(AppId) when is_binary(AppId) ->
[] -> undefined
end.
-spec(lookup_app(appid()) -> {{appid(), appsecret(), binary(), binary(), boolean(), integer() | undefined} | undefined}).
-spec(lookup_app(appid()) -> undefined | {appid(), appsecret(), binary(), binary(), boolean(), integer() | undefined}).
lookup_app(AppId) when is_binary(AppId) ->
case mnesia:dirty_read(mqtt_app, AppId) of
[#mqtt_app{id = AppId,

2
apps/emqx_management/src/emqx_mgmt_cli.erl
View File

@ -420,7 +420,7 @@ log(["primary-level", Level]) ->
emqx_ctl:print("~s~n", [emqx_logger:get_primary_log_level()]);
log(["handlers", "list"]) ->
[emqx_ctl:print("LogHandler(id=~s, level=~s, destination=~s, status=~s)~n", [Id, Level, Dst, Status])
_ = [emqx_ctl:print("LogHandler(id=~s, level=~s, destination=~s, status=~s)~n", [Id, Level, Dst, Status])
|| #{id := Id, level := Level, dst := Dst, status := Status} <- emqx_logger:get_log_handlers()],
ok;

2
apps/emqx_rule_engine/src/emqx_rule_engine.erl
View File

@ -250,7 +250,7 @@ update_resource(#{id := Id, type := Type, config := NewConfig, description := De
{ok, #resource_type{on_create = {Module, Create},
params_spec = ParamSpec}} ->
Config = emqx_rule_validator:validate_params(NewConfig, ParamSpec),
delete_resource(Id),
_ = delete_resource(Id),
emqx_rule_registry:add_resource(#resource{id = Id,
config = Config,
type = Type,

2
apps/emqx_rule_engine/src/emqx_rule_engine_api.erl
View File

@ -326,7 +326,7 @@ update_resource(#{id := Id}, Params) ->
{ok, #resource{id = Id, type = Type} = _OldResource} ->
Config = maps:get(config, parse_resource_params(Params)),
Description = maps:get(description, parse_resource_params(Params)),
emqx_rule_engine:update_resource(#{id => Id,
_ = emqx_rule_engine:update_resource(#{id => Id,
config => Config,
type => Type,
description => Description,