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

refactor: add a more generic name for password_converter

This commit is contained in:
Zaiming (Stone) Shi 2023-01-16 10:59:37 +01:00
parent 2afbf6a406
commit 263deae1f3
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,7 +114,7 @@
-export([namespace/0, roots/0, roots/1, fields/1, desc/1, tags/0]). -export([namespace/0, roots/0, roots/1, fields/1, desc/1, tags/0]).
-export([conf_get/2, conf_get/3, keys/2, filter/1]). -export([conf_get/2, conf_get/3, keys/2, filter/1]).
-export([server_ssl_opts_schema/2, client_ssl_opts_schema/1, ciphers_schema/1]). -export([server_ssl_opts_schema/2, client_ssl_opts_schema/1, ciphers_schema/1]).
-export([password_converter/2]). -export([password_converter/2, bin_str_converter/2]).
-export([authz_fields/0]). -export([authz_fields/0]).
-export([sc/2, map/2]). -export([sc/2, map/2]).
@ -2072,11 +2072,14 @@ do_default_ciphers(_) ->
%% otherwise resolve default ciphers list at runtime %% otherwise resolve default ciphers list at runtime
[]. [].
password_converter(undefined, _) -> password_converter(X, Opts) ->
bin_str_converter(X, Opts).
bin_str_converter(undefined, _) ->
undefined; undefined;
password_converter(I, _) when is_integer(I) -> bin_str_converter(I, _) when is_integer(I) ->
integer_to_binary(I); integer_to_binary(I);
password_converter(X, _) -> bin_str_converter(X, _) ->
try try
iolist_to_binary(X) iolist_to_binary(X)
catch catch