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

Merge pull request #7338 from JimMoen/fix-mongo-servers-schema 

fix(mongo): servers for mongo_sharded and mongo_rs
This commit is contained in:
JimMoen 2022-03-21 10:19:20 +08:00 committed by GitHub
parent a85b31d904 ed021d125f
commit a5a9613512
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/emqx_connector/src/emqx_connector_mongo.erl
View File

@ -298,7 +298,7 @@ server(converter) -> fun to_server_raw/1;
server(desc) -> ?SERVER_DESC("MongoDB", integer_to_list(?MONGO_DEFAULT_PORT)); server(desc) -> ?SERVER_DESC("MongoDB", integer_to_list(?MONGO_DEFAULT_PORT));
server(_) -> undefined. server(_) -> undefined.
servers(type) -> binary(); servers(type) -> list();
servers(required) -> true; servers(required) -> true;
servers(validator) -> [?NOT_EMPTY("the value of the field 'servers' cannot be empty")]; servers(validator) -> [?NOT_EMPTY("the value of the field 'servers' cannot be empty")];
servers(converter) -> fun to_servers_raw/1; servers(converter) -> fun to_servers_raw/1;
@ -352,7 +352,8 @@ may_parse_srv_and_txt_records_(#{mongo_type := Type,
parse_srv_records(Type, Servers) -> parse_srv_records(Type, Servers) ->
Fun = fun(AccIn, {IpOrHost, _Port}) -> Fun = fun(AccIn, {IpOrHost, _Port}) ->
case inet_res:lookup("_mongodb._tcp." ++ ip_or_host_to_string(IpOrHost), in, srv) of case inet_res:lookup("_mongodb._tcp."
++ ip_or_host_to_string(IpOrHost), in, srv) of
[] -> [] ->
error(service_not_found); error(service_not_found);
Services -> Services ->
@ -367,6 +368,10 @@ parse_srv_records(Type, Servers) ->
end. end.
parse_txt_records(Type, Servers) -> parse_txt_records(Type, Servers) ->
Fields = case Type of
rs -> ["authSource", "replicaSet"];
_ -> ["authSource"]
end,
Fun = fun(AccIn, {IpOrHost, _Port}) -> Fun = fun(AccIn, {IpOrHost, _Port}) ->
case inet_res:lookup(IpOrHost, in, txt) of case inet_res:lookup(IpOrHost, in, txt) of
[] -> [] ->
@ -376,10 +381,6 @@ parse_txt_records(Type, Servers) ->
{error, _, _} -> {error, _, _} ->
error({invalid_txt_record, invalid_query_string}); error({invalid_txt_record, invalid_query_string});
Options -> Options ->
Fields = case Type of
rs -> ["authSource", "replicaSet"];
_ -> ["authSource"]
end,
maps:merge(AccIn, take_and_convert(Fields, Options)) maps:merge(AccIn, take_and_convert(Fields, Options))
end; end;
_ -> _ ->