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

Merge pull request #7429 from JimMoen/fix-authn-redis-api 

fix authn redis api and eredis_cluster version
This commit is contained in:
JimMoen 2022-03-29 09:57:02 +08:00 committed by GitHub
parent 3db1080887 e0fbf08d7e
commit e9ce91b60c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_authn/src/emqx_authn_api.erl
View File

@ -1095,7 +1095,7 @@ serialize_error({invalid_parameter, Name}) ->
message => binfmt("Invalid value for '~p'", [Name])}}; message => binfmt("Invalid value for '~p'", [Name])}};
serialize_error({unknown_authn_type, Type}) -> serialize_error({unknown_authn_type, Type}) ->
{400, #{code => <<"BAD_REQUEST">>, {400, #{code => <<"BAD_REQUEST">>,
message => binfmt("Unknown type '~ts'", [Type])}}; message => binfmt("Unknown type '~p'", [Type])}};
serialize_error({bad_authenticator_config, Reason}) -> serialize_error({bad_authenticator_config, Reason}) ->
{400, #{code => <<"BAD_REQUEST">>, {400, #{code => <<"BAD_REQUEST">>,
message => binfmt("Bad authenticator config ~p", [Reason])}}; message => binfmt("Bad authenticator config ~p", [Reason])}};

2
apps/emqx_connector/rebar.config
View File

@ -13,7 +13,7 @@
%% NOTE: mind poolboy version when updating mongodb-erlang version %% NOTE: mind poolboy version when updating mongodb-erlang version
{mongodb, {git,"https://github.com/emqx/mongodb-erlang", {tag, "v3.0.12"}}}, {mongodb, {git,"https://github.com/emqx/mongodb-erlang", {tag, "v3.0.12"}}},
%% NOTE: mind poolboy version when updating eredis_cluster version %% NOTE: mind poolboy version when updating eredis_cluster version
{eredis_cluster, {git, "https://github.com/emqx/eredis_cluster", {tag, "0.7.0"}}}, {eredis_cluster, {git, "https://github.com/emqx/eredis_cluster", {tag, "0.7.1"}}},
%% mongodb-erlang uses a special fork https://github.com/comtihon/poolboy.git %% mongodb-erlang uses a special fork https://github.com/comtihon/poolboy.git
%% (which has overflow_ttl feature added). %% (which has overflow_ttl feature added).
%% However, it references `{branch, "master}` (commit 9c06a9a on 2021-04-07). %% However, it references `{branch, "master}` (commit 9c06a9a on 2021-04-07).