diff --git a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_cli.erl b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_cli.erl index d6a8e8cb4..19ade2aec 100644 --- a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_cli.erl +++ b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_cli.erl @@ -156,18 +156,11 @@ auth_username_cli(["add", Username, Password]) -> {error, Reason} -> emqx_ctl:print("Error: ~p~n", [Reason]) end; -<<<<<<< HEAD auth_username_cli(["update", Username, NewPassword]) -> case update_user({username, iolist_to_binary(Username)}, iolist_to_binary(NewPassword)) of ok -> emqx_ctl:print("ok~n"); {error, Reason} -> emqx_ctl:print("Error: ~p~n", [Reason]) end; -======= -acl_cli(["del", Login, Topic])-> - ok = remove_acl(iolist_to_binary(Login), iolist_to_binary(Topic)), - emqx_ctl:print("ok~n"); ->>>>>>> bb37bac5... Umbrella fix build (#5) - auth_username_cli(["del", Username]) -> case remove_user({username, iolist_to_binary(Username)}) of ok -> emqx_ctl:print("ok~n"); diff --git a/apps/emqx_auth_pgsql/src/emqx_auth_pgsql_cli.erl b/apps/emqx_auth_pgsql/src/emqx_auth_pgsql_cli.erl index fdfd1b9b8..dbb13c278 100644 --- a/apps/emqx_auth_pgsql/src/emqx_auth_pgsql_cli.erl +++ b/apps/emqx_auth_pgsql/src/emqx_auth_pgsql_cli.erl @@ -64,9 +64,6 @@ connect(Opts) -> {ok, C} -> conn_post(C), {ok, C}; - {error, Reason = econnrefused} -> - ?LOG(error, "[Postgres] Can't connect to Postgres server: Connection refused."), - {error, Reason}; {error, Reason = invalid_authorization_specification} -> ?LOG(error, "[Postgres] Can't connect to Postgres server: Invalid authorization specification."), {error, Reason}; diff --git a/apps/emqx_bridge_mqtt/src/emqx_bridge_worker.erl b/apps/emqx_bridge_mqtt/src/emqx_bridge_worker.erl index 768cd3258..81954c62b 100644 --- a/apps/emqx_bridge_mqtt/src/emqx_bridge_worker.erl +++ b/apps/emqx_bridge_mqtt/src/emqx_bridge_worker.erl @@ -307,7 +307,7 @@ idle({call, From}, ensure_started, State) -> case do_connect(State) of {ok, State1} -> {next_state, connected, State1, [{reply, From, ok}, {state_timeout, 0, connected}]}; - {error, Reason} -> + {error, Reason, _State} -> {keep_state_and_data, [{reply, From, {error, Reason}}]} end; %% @doc Standing by for manual start. @@ -320,12 +320,8 @@ idle(state_timeout, reconnect, State) -> connecting(State); idle(info, {batch_ack, Ref}, State) -> - case do_ack(State, Ref) of - {ok, NewState} -> - {keep_state, NewState}; - _ -> - keep_state_and_data - end; + {ok, NewState} = do_ack(State, Ref), + {keep_state, NewState}; idle(Type, Content, State) -> common(idle, Type, Content, State). @@ -359,12 +355,8 @@ connected(info, {disconnected, Conn, Reason}, keep_state_and_data end; connected(info, {batch_ack, Ref}, State) -> - case do_ack(State, Ref) of - {ok, NewState} -> - {keep_state, NewState, {next_event, internal, maybe_send}}; - _ -> - keep_state_and_data - end; + {ok, NewState} = do_ack(State, Ref), + {keep_state, NewState, {next_event, internal, maybe_send}}; connected(Type, Content, State) -> common(connected, Type, Content, State). diff --git a/apps/emqx_exproto/src/emqx_exproto_channel.erl b/apps/emqx_exproto/src/emqx_exproto_channel.erl index 9786c12c2..4865cca58 100644 --- a/apps/emqx_exproto/src/emqx_exproto_channel.erl +++ b/apps/emqx_exproto/src/emqx_exproto_channel.erl @@ -331,7 +331,7 @@ handle_call({publish, Topic, Qos, Payload}, _ -> Msg = emqx_message:make(From, Qos, Topic, Payload), NMsg = emqx_mountpoint:mount(Mountpoint, Msg), - emqx:publish(NMsg), + _ = emqx:publish(NMsg), {reply, ok, Channel} end; diff --git a/apps/emqx_exproto/src/emqx_exproto_conn.erl b/apps/emqx_exproto/src/emqx_exproto_conn.erl index 3b05e91be..cfd908d64 100644 --- a/apps/emqx_exproto/src/emqx_exproto_conn.erl +++ b/apps/emqx_exproto/src/emqx_exproto_conn.erl @@ -451,8 +451,8 @@ handle_msg(Msg, State) -> terminate(Reason, State = #state{channel = Channel}) -> ?LOG(debug, "Terminated due to ~p", [Reason]), - emqx_exproto_channel:terminate(Reason, Channel), - close_socket(State), + _ = emqx_exproto_channel:terminate(Reason, Channel), + _ = close_socket(State), exit(Reason). %%-------------------------------------------------------------------- diff --git a/apps/emqx_lua_hook/src/emqx_lua_hook.erl b/apps/emqx_lua_hook/src/emqx_lua_hook.erl index afdb63f51..6f3f42368 100644 --- a/apps/emqx_lua_hook/src/emqx_lua_hook.erl +++ b/apps/emqx_lua_hook/src/emqx_lua_hook.erl @@ -184,7 +184,7 @@ do_register(Hook, ScriptName, _St) -> do_register_hooks([], _ScriptName, _St) -> ok; do_register_hooks([H|T], ScriptName, St) -> - do_register(H, ScriptName, St), + _ = do_register(H, ScriptName, St), do_register_hooks(T, ScriptName, St); do_register_hooks(Hook = <<$o, $n, _Rest/binary>>, ScriptName, St) -> do_register(Hook, ScriptName, St); diff --git a/apps/emqx_lwm2m/src/emqx_lwm2m_json.erl b/apps/emqx_lwm2m/src/emqx_lwm2m_json.erl index 77fc0619c..3da69c6c4 100644 --- a/apps/emqx_lwm2m/src/emqx_lwm2m_json.erl +++ b/apps/emqx_lwm2m/src/emqx_lwm2m_json.erl @@ -240,10 +240,10 @@ insert_resource_into_object_instance([ResourceId, ResourceInstanceId], Value, Ac ?LOG(debug, "insert_resource_into_object_instance1() ResourceId=~p, ResourceInstanceId=~p, Value=~p, Acc=~p", [ResourceId, ResourceInstanceId, Value, Acc]), case find_resource(ResourceId, Acc) of undefined -> - NewList = insert_resource_instance_into_resource(ResourceInstanceId, Value, []), + NewList = insert_resource_instance_into_resource([ResourceInstanceId], Value, []), Acc++[#{tlv_multiple_resource=>integer(ResourceId), value=>NewList}]; Resource = #{value:=List}-> - NewList = insert_resource_instance_into_resource(ResourceInstanceId, Value, List), + NewList = insert_resource_instance_into_resource([ResourceInstanceId], Value, List), Acc2 = lists:delete(Resource, Acc), Acc2 ++ [Resource#{value=>NewList}] end; @@ -258,7 +258,7 @@ insert_resource_into_object_instance([ResourceId], Value, Acc) -> Acc2 ++ [NewMap] end. -insert_resource_instance_into_resource(ResourceInstanceId, Value, Acc) -> +insert_resource_instance_into_resource([ResourceInstanceId], Value, Acc) -> ?LOG(debug, "insert_resource_instance_into_resource() ResourceInstanceId=~p, Value=~p, Acc=~p", [ResourceInstanceId, Value, Acc]), NewMap = #{tlv_resource_instance=>integer(ResourceInstanceId), value=>Value}, case find_resource_instance(ResourceInstanceId, Acc) of diff --git a/apps/emqx_management/src/emqx_mgmt_api.erl b/apps/emqx_management/src/emqx_mgmt_api.erl index f24d30a8a..38b9d4db0 100644 --- a/apps/emqx_management/src/emqx_mgmt_api.erl +++ b/apps/emqx_management/src/emqx_mgmt_api.erl @@ -37,7 +37,9 @@ paginate(Tables, Params, RowFun) -> Limit = limit(Params), Cursor = qlc:cursor(Qh), case Page > 1 of - true -> qlc:next_answers(Cursor, (Page - 1) * Limit); + true -> + _ = qlc:next_answers(Cursor, (Page - 1) * Limit), + ok; false -> ok end, Rows = qlc:next_answers(Cursor, Limit), diff --git a/src/emqx_modules.erl b/src/emqx_modules.erl index f683ab1dd..47d24671a 100644 --- a/src/emqx_modules.erl +++ b/src/emqx_modules.erl @@ -77,14 +77,17 @@ unload(ModuleName) -> unload_module(ModuleName, true) end. +-spec(reload(module()) -> ok | ignore | {error, any()}). reload(emqx_mod_acl_internal) -> Modules = emqx:get_env(modules, []), Env = proplists:get_value(emqx_mod_acl_internal, Modules, undefined), case emqx_mod_acl_internal:reload(Env) of ok -> - ?LOG(info, "Reload ~s module successfully.", [emqx_mod_acl_internal]); + ?LOG(info, "Reload ~s module successfully.", [emqx_mod_acl_internal]), + ok; {error, Error} -> - ?LOG(error, "Reload module ~s failed, cannot start for ~0p", [emqx_mod_acl_internal, Error]) + ?LOG(error, "Reload module ~s failed, cannot start for ~0p", [emqx_mod_acl_internal, Error]), + {error, Error} end; reload(_) -> ignore.