Преглед изворни кода

Merge pull request #13845 from qzhuyan/dev/william/quicer-0.1.0

chore: bump to quicer 0.1.0
William Yang пре 1 година
родитељ
комит
0643bf8fca

+ 1 - 1
apps/emqx/rebar.config.script

@@ -25,7 +25,7 @@ end,
 
 
 Bcrypt = {bcrypt, {git, "https://github.com/emqx/erlang-bcrypt.git", {tag, "0.6.0"}}},
 Bcrypt = {bcrypt, {git, "https://github.com/emqx/erlang-bcrypt.git", {tag, "0.6.0"}}},
 Quicer =
 Quicer =
-    {quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.500"}}}.
+    {quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.1.0"}}}.
 
 
 Dialyzer = fun(Config) ->
 Dialyzer = fun(Config) ->
     {dialyzer, OldDialyzerConfig} = lists:keyfind(dialyzer, 1, Config),
     {dialyzer, OldDialyzerConfig} = lists:keyfind(dialyzer, 1, Config),

+ 1 - 1
apps/emqx_conf/src/emqx_conf.app.src

@@ -1,6 +1,6 @@
 {application, emqx_conf, [
 {application, emqx_conf, [
     {description, "EMQX configuration management"},
     {description, "EMQX configuration management"},
-    {vsn, "0.3.0"},
+    {vsn, "0.3.1"},
     {registered, []},
     {registered, []},
     {mod, {emqx_conf_app, []}},
     {mod, {emqx_conf_app, []}},
     {applications, [kernel, stdlib]},
     {applications, [kernel, stdlib]},

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

@@ -227,12 +227,13 @@ fields("cluster") ->
             )},
             )},
         {"quic_lb_mode",
         {"quic_lb_mode",
             sc(
             sc(
-                integer(),
+                hoconsc:union([integer(), string()]),
                 #{
                 #{
                     mapping => "quicer.lb_mode",
                     mapping => "quicer.lb_mode",
                     default => 0,
                     default => 0,
                     'readOnly' => true,
                     'readOnly' => true,
-                    desc => ?DESC(cluster_quic_lb_mode)
+                    desc => ?DESC(cluster_quic_lb_mode),
+                    importance => ?IMPORTANCE_HIDDEN
                 }
                 }
             )},
             )},
         {"static",
         {"static",

+ 1 - 1
mix.exs

@@ -1172,7 +1172,7 @@ defmodule EMQXUmbrella.MixProject do
     if enable_quicer?(),
     if enable_quicer?(),
       # in conflict with emqx and emqtt
       # in conflict with emqx and emqtt
       do: [
       do: [
-        {:quicer, github: "emqx/quic", tag: "0.0.500", override: true}
+        {:quicer, github: "emqx/quic", tag: "0.1.0", override: true}
       ],
       ],
       else: []
       else: []
   end
   end

+ 1 - 1
rebar.config.erl

@@ -36,7 +36,7 @@ assert_otp() ->
     end.
     end.
 
 
 quicer() ->
 quicer() ->
-    {quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.500"}}}.
+    {quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.1.0"}}}.
 
 
 jq() ->
 jq() ->
     {jq, {git, "https://github.com/emqx/jq", {tag, "v0.3.12"}}}.
     {jq, {git, "https://github.com/emqx/jq", {tag, "v0.3.12"}}}.

+ 3 - 1
rel/i18n/emqx_conf_schema.hocon

@@ -72,7 +72,9 @@ cluster_quic_lb_mode.desc:
 """QUIC stack LB Mode
 """QUIC stack LB Mode
 - 0: disabled (Default)
 - 0: disabled (Default)
 - 1: server_ip
 - 1: server_ip
-- 2: server_id_fixed"""
+- 2: server_id_fixed
+- N: when N>2 server_id_fixed and server_id is N
+- IfName: when IfName is string, server_id will be set to the first ip on interface IfName, ipv4 only"""
 
 
 cluster_quic_lb_mode.label:
 cluster_quic_lb_mode.label:
 """ QUIC stack LB Mode """
 """ QUIC stack LB Mode """