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

fix(emqx_schema): Set gen_rpc_client_driver automatically

This commit is contained in:
k32 2022-02-02 13:58:27 +01:00
parent 621d5a2efd
commit a54b4ddfd0
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/emqx_conf/src/emqx_conf_schema.erl
View File

@ -459,13 +459,15 @@ fields("rpc") ->
, {"keyfile", , {"keyfile",
sc(file(), sc(file(),
#{ mapping => "gen_rpc.keyfile" #{ mapping => "gen_rpc.keyfile"
, desc => "Path to the private key file for the <code>rpc.certfile</code>." , desc => "Path to the private key file for the <code>rpc.certfile</code>.<br/>"
"Note: contents of this file are secret, so it's necessary to set permissions to 600."
})} })}
, {"cacertfile", , {"cacertfile",
sc(file(), sc(file(),
#{ mapping => "gen_rpc.cacertfile" #{ mapping => "gen_rpc.cacertfile"
, desc => "Path to certification authority TLS certificate file used to validate " , desc => "Path to certification authority TLS certificate file used to validate "
"<code>rpc.certfile</code>." "<code>rpc.certfile</code>.<br/>"
"Note: certificates of all nodes in the cluster must be signed by the same CA."
})} })}
, {"send_timeout", , {"send_timeout",
sc(emqx_schema:duration(), sc(emqx_schema:duration(),
@ -603,7 +605,7 @@ fields("authorization") ->
emqx_schema:fields("authorization") ++ emqx_schema:fields("authorization") ++
emqx_authz_schema:fields("authorization"). emqx_authz_schema:fields("authorization").
translations() -> ["ekka", "kernel", "emqx"]. translations() -> ["ekka", "kernel", "emqx", "gen_rpc"].
translation("ekka") -> translation("ekka") ->
[ {"cluster_discovery", fun tr_cluster_discovery/1}]; [ {"cluster_discovery", fun tr_cluster_discovery/1}];
@ -614,8 +616,14 @@ translation("emqx") ->
[ {"config_files", fun tr_config_files/1} [ {"config_files", fun tr_config_files/1}
, {"cluster_override_conf_file", fun tr_cluster_override_conf_file/1} , {"cluster_override_conf_file", fun tr_cluster_override_conf_file/1}
, {"local_override_conf_file", fun tr_local_override_conf_file/1} , {"local_override_conf_file", fun tr_local_override_conf_file/1}
];
translation("gen_rpc") ->
[ {"default_client_driver", fun tr_default_config_driver/1}
]. ].
tr_default_config_driver(Conf) ->
conf_get("rpc.driver", Conf).
tr_config_files(Conf) -> tr_config_files(Conf) ->
case conf_get("emqx.config_files", Conf) of case conf_get("emqx.config_files", Conf) of
[_ | _] = Files -> [_ | _] = Files ->