Merge pull request #11065 from SergeTupchiy/EMQX-9992-fix-async-cleanup-error-logs
fix: avoid logging unnecessary errors in async cleanup functions
This commit is contained in:
commit
8480a26b66
|
@ -153,13 +153,17 @@ code_change(_OldVsn, State, _Extra) ->
|
|||
%%--------------------------------------------------------------------
|
||||
|
||||
clean_down(SubPid) ->
|
||||
case ets:lookup(?SUBMON, SubPid) of
|
||||
[{_, SubId}] ->
|
||||
true = ets:delete(?SUBMON, SubPid),
|
||||
true =
|
||||
(SubId =:= undefined) orelse
|
||||
ets:delete_object(?SUBID, {SubId, SubPid}),
|
||||
emqx_broker:subscriber_down(SubPid);
|
||||
[] ->
|
||||
ok
|
||||
try
|
||||
case ets:lookup(?SUBMON, SubPid) of
|
||||
[{_, SubId}] ->
|
||||
true = ets:delete(?SUBMON, SubPid),
|
||||
true =
|
||||
(SubId =:= undefined) orelse
|
||||
ets:delete_object(?SUBID, {SubId, SubPid}),
|
||||
emqx_broker:subscriber_down(SubPid);
|
||||
[] ->
|
||||
ok
|
||||
end
|
||||
catch
|
||||
error:badarg -> ok
|
||||
end.
|
||||
|
|
|
@ -706,7 +706,11 @@ code_change(_OldVsn, State, _Extra) ->
|
|||
%%--------------------------------------------------------------------
|
||||
|
||||
clean_down({ChanPid, ClientId}) ->
|
||||
do_unregister_channel({ClientId, ChanPid}),
|
||||
try
|
||||
do_unregister_channel({ClientId, ChanPid})
|
||||
catch
|
||||
error:badarg -> ok
|
||||
end,
|
||||
ok = ?tp(debug, emqx_cm_clean_down, #{client_id => ClientId}).
|
||||
|
||||
stats_fun() ->
|
||||
|
|
|
@ -823,7 +823,11 @@ code_change(_OldVsn, State, _Extra) ->
|
|||
do_unregister_channel_task(Items, GwName, CmTabs) ->
|
||||
lists:foreach(
|
||||
fun({ChanPid, ClientId}) ->
|
||||
do_unregister_channel(GwName, {ClientId, ChanPid}, CmTabs)
|
||||
try
|
||||
do_unregister_channel(GwName, {ClientId, ChanPid}, CmTabs)
|
||||
catch
|
||||
error:badarg -> ok
|
||||
end
|
||||
end,
|
||||
Items
|
||||
).
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Avoid logging irrelevant error messages during EMQX shutdown.
|
Loading…
Reference in New Issue