diff --git a/apps/emqx_connector/src/emqx_connector.app.src b/apps/emqx_connector/src/emqx_connector.app.src index 547a37b8e..1bfce0735 100644 --- a/apps/emqx_connector/src/emqx_connector.app.src +++ b/apps/emqx_connector/src/emqx_connector.app.src @@ -1,7 +1,7 @@ %% -*- mode: erlang -*- {application, emqx_connector, [ {description, "An OTP application"}, - {vsn, "0.1.8"}, + {vsn, "0.1.9"}, {registered, []}, {mod, {emqx_connector_app, []}}, {applications, [ diff --git a/apps/emqx_connector/src/emqx_connector_ssl.erl b/apps/emqx_connector/src/emqx_connector_ssl.erl index 7dc6179e1..450206ced 100644 --- a/apps/emqx_connector/src/emqx_connector_ssl.erl +++ b/apps/emqx_connector/src/emqx_connector_ssl.erl @@ -70,14 +70,11 @@ try_clear_certs(RltvDir, NewConf, OldConf) -> ). try_clear_certs2(RltvDir, #{<<"connector">> := NewConnector}, #{<<"connector">> := OldConnector}) -> - NewSSL = maps:get(<<"ssl">>, NewConnector, undefined), - OldSSL = maps:get(<<"ssl">>, OldConnector, undefined), - try_clear_certs2(RltvDir, NewSSL, OldSSL); -try_clear_certs2(RltvDir, NewSSL, OldSSL) when is_map(NewSSL) andalso is_map(OldSSL) -> - ok = emqx_tls_lib:delete_ssl_files(RltvDir, NewSSL, OldSSL); + try_clear_certs2(RltvDir, NewConnector, OldConnector); try_clear_certs2(RltvDir, NewConf, OldConf) -> - ?SLOG(debug, #{msg => "unexpected_conf", path => RltvDir, new => NewConf, OldConf => OldConf}), - ok. + NewSSL = try_map_get(<<"ssl">>, NewConf, undefined), + OldSSL = try_map_get(<<"ssl">>, OldConf, undefined), + ok = emqx_tls_lib:delete_ssl_files(RltvDir, NewSSL, OldSSL). new_ssl_config(RltvDir, Config, SSL) -> case emqx_tls_lib:ensure_ssl_files(RltvDir, SSL) of @@ -100,3 +97,8 @@ new_ssl_config(Config, _NewSSL) -> normalize_key_to_bin(Map) -> emqx_map_lib:binary_key_map(Map). + +try_map_get(Key, Map, Default) when is_map(Map) -> + maps:get(Key, Map, Default); +try_map_get(_Key, undefined, Default) -> + Default.