Просмотр исходного кода

fix(emqx_schema): Set gen_rpc_client_driver automatically

k32 4 лет назад
Родитель
Сommit
a54b4ddfd0
1 измененных файлов с 11 добавлено и 3 удалено
  1. 11 3
      apps/emqx_conf/src/emqx_conf_schema.erl

+ 11 - 3
apps/emqx_conf/src/emqx_conf_schema.erl

@@ -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 ->