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

refactor(emqx_config_handler): async remove

This commit is contained in:
Zaiming Shi 2021-10-20 13:13:03 +02:00 committed by x1001100011
parent 6d9b3ed341
commit c0364ad5a2
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/emqx/src/emqx_authentication.erl
View File

@ -557,8 +557,14 @@ handle_info(Info, State) ->
{noreply, State}. {noreply, State}.
terminate(Reason, _State) -> terminate(Reason, _State) ->
?SLOG(error, #{msg => "emqx_authentication_terminating", case Reason of
reason => Reason}), normal -> ok;
{shutdown, _} -> ok;
Other -> ?SLOG(error, #{msg => "emqx_authentication_terminating",
reason => Other})
end,
emqx_config_handler:remove_handler([authentication]),
emqx_config_handler:remove_handler([listeners, '?', '?', authentication]),
ok. ok.
code_change(_OldVsn, State, _Extra) -> code_change(_OldVsn, State, _Extra) ->

12
apps/emqx/src/emqx_authentication_config.erl
View File

@ -221,12 +221,12 @@ convert_certs(CertsDir, NewConfig, OldConfig) ->
OldSSLOpts = maps:get(<<"ssl">>, OldConfig, #{}), OldSSLOpts = maps:get(<<"ssl">>, OldConfig, #{}),
Diff = diff_certs(NewSSLOpts, OldSSLOpts), Diff = diff_certs(NewSSLOpts, OldSSLOpts),
NSSLOpts = lists:foldl(fun({identical, K}, Acc) -> NSSLOpts = lists:foldl(fun({identical, K}, Acc) ->
Acc#{K => maps:get(K, OldSSLOpts)}; Acc#{K => maps:get(K, OldSSLOpts)};
({_, K}, Acc) -> ({_, K}, Acc) ->
CertFile = generate_filename(CertsDir, K), CertFile = generate_filename(CertsDir, K),
ok = save_cert_to_file(CertFile, maps:get(K, NewSSLOpts)), ok = save_cert_to_file(CertFile, maps:get(K, NewSSLOpts)),
Acc#{K => CertFile} Acc#{K => CertFile}
end, NewSSLOpts, Diff), end, NewSSLOpts, Diff),
NewConfig#{<<"ssl">> => NSSLOpts} NewConfig#{<<"ssl">> => NSSLOpts}
end. end.

11
apps/emqx/src/emqx_config_handler.erl
View File

@ -77,9 +77,10 @@ update_config(SchemaModule, ConfKeyPath, UpdateArgs) ->
add_handler(ConfKeyPath, HandlerName) -> add_handler(ConfKeyPath, HandlerName) ->
gen_server:call(?MODULE, {add_handler, ConfKeyPath, HandlerName}, infinity). gen_server:call(?MODULE, {add_handler, ConfKeyPath, HandlerName}, infinity).
%% @doc Remove handler asynchronously
-spec remove_handler(emqx_config:config_key_path()) -> ok. -spec remove_handler(emqx_config:config_key_path()) -> ok.
remove_handler(ConfKeyPath) -> remove_handler(ConfKeyPath) ->
gen_server:call(?MODULE, {remove_handler, ConfKeyPath}, infinity). gen_server:cast(?MODULE, {remove_handler, ConfKeyPath}).
%%============================================================================ %%============================================================================
@ -95,11 +96,6 @@ handle_call({add_handler, ConfKeyPath, HandlerName}, _From, State = #{handlers :
{reply, Error, State} {reply, Error, State}
end; end;
handle_call({remove_handler, ConfKeyPath}, _From,
State = #{handlers := Handlers}) ->
{reply, ok, State#{handlers =>
emqx_map_lib:deep_remove(ConfKeyPath ++ [?MOD], Handlers)}};
handle_call({change_config, SchemaModule, ConfKeyPath, UpdateArgs}, _From, handle_call({change_config, SchemaModule, ConfKeyPath, UpdateArgs}, _From,
#{handlers := Handlers} = State) -> #{handlers := Handlers} = State) ->
Reply = try Reply = try
@ -125,6 +121,9 @@ handle_call(_Request, _From, State) ->
Reply = ok, Reply = ok,
{reply, Reply, State}. {reply, Reply, State}.
handle_cast({remove_handler, ConfKeyPath},
State = #{handlers := Handlers}) ->
{noreply, State#{handlers => emqx_map_lib:deep_remove(ConfKeyPath ++ [?MOD], Handlers)}};
handle_cast(_Msg, State) -> handle_cast(_Msg, State) ->
{noreply, State}. {noreply, State}.