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

refactor(emqx.schema): use override_env to support alternative env

This commit is contained in:
z8674558 2021-04-04 20:27:38 +09:00
parent 06b4da8269
commit 9db5452b6c
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
priv/emqx.schema
View File

@ -214,7 +214,8 @@ end}.
%% @doc Secret cookie for distributed erlang node %% @doc Secret cookie for distributed erlang node
{mapping, "node.cookie", "vm_args.-setcookie", [ {mapping, "node.cookie", "vm_args.-setcookie", [
{default, "emqxsecretcookie"} {default, "emqxsecretcookie"},
{override_env, "NODE_COOKIE"}
]}. ]}.
{mapping, "node.data_dir", "emqx.data_dir", [ {mapping, "node.data_dir", "emqx.data_dir", [
@ -250,7 +251,8 @@ end}.
%% Valid range is 1024-134217727 %% Valid range is 1024-134217727
{mapping, "node.max_ports", "vm_args.+Q", [ {mapping, "node.max_ports", "vm_args.+Q", [
{datatype, integer}, {datatype, integer},
{validators, ["range4ports"]} {validators, ["range4ports"]},
{override_env, "MAX_PORTS"}
]}. ]}.
{validator, "range4ports", "must be 1024 to 134217727", {validator, "range4ports", "must be 1024 to 134217727",
@ -758,7 +760,8 @@ end}.
%% @doc Max Packet Size Allowed, 1MB by default. %% @doc Max Packet Size Allowed, 1MB by default.
{mapping, "mqtt.max_packet_size", "emqx.max_packet_size", [ {mapping, "mqtt.max_packet_size", "emqx.max_packet_size", [
{default, "1MB"}, {default, "1MB"},
{datatype, bytesize} {datatype, bytesize},
{override_env, "MAX_PACKET_SIZE"}
]}. ]}.
%% @doc Set the Max ClientId Length Allowed. %% @doc Set the Max ClientId Length Allowed.
@ -1177,6 +1180,11 @@ end}.
{datatype, [integer, ip]} {datatype, [integer, ip]}
]}. ]}.
{mapping, "listener.tcp.external", "emqx.listeners", [
{datatype, [integer, ip]},
{override_env, "TCP_PORT"}
]}.
{mapping, "listener.tcp.$name.acceptors", "emqx.listeners", [ {mapping, "listener.tcp.$name.acceptors", "emqx.listeners", [
{default, 8}, {default, 8},
{datatype, integer} {datatype, integer}
@ -1284,6 +1292,11 @@ end}.
{datatype, [integer, ip]} {datatype, [integer, ip]}
]}. ]}.
{mapping, "listener.ssl.external", "emqx.listeners", [
{datatype, [integer, ip]},
{override_env, "SSL_PORT"}
]}.
{mapping, "listener.ssl.$name.acceptors", "emqx.listeners", [ {mapping, "listener.ssl.$name.acceptors", "emqx.listeners", [
{default, 8}, {default, 8},
{datatype, integer} {datatype, integer}
@ -1452,6 +1465,11 @@ end}.
{datatype, [integer, ip]} {datatype, [integer, ip]}
]}. ]}.
{mapping, "listener.ws.external", "emqx.listeners", [
{datatype, [integer, ip]},
{override_env, "WS_PORT"}
]}.
{mapping, "listener.ws.$name.mqtt_path", "emqx.listeners", [ {mapping, "listener.ws.$name.mqtt_path", "emqx.listeners", [
{default, "/mqtt"}, {default, "/mqtt"},
{datatype, string} {datatype, string}
@ -1632,6 +1650,11 @@ end}.
{datatype, [integer, ip]} {datatype, [integer, ip]}
]}. ]}.
{mapping, "listener.wss.external", "emqx.listeners", [
{datatype, [integer, ip]},
{override_env, "WSS_PORT"}
]}.
{mapping, "listener.wss.$name.mqtt_path", "emqx.listeners", [ {mapping, "listener.wss.$name.mqtt_path", "emqx.listeners", [
{default, "/mqtt"}, {default, "/mqtt"},
{datatype, string} {datatype, string}

2
rebar.config
View File

@ -42,7 +42,7 @@
, {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.0"}}} , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.0"}}}
, {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.8.0"}}} , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.8.0"}}}
, {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.5.0"}}} , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.5.0"}}}
, {cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v3.2.0"}}} , {cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v3.2.1"}}}
, {minirest, {git, "https://github.com/emqx/minirest", {tag, "0.3.5"}}} , {minirest, {git, "https://github.com/emqx/minirest", {tag, "0.3.5"}}}
, {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.0"}}} , {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.0"}}}
, {replayq, {git, "https://github.com/emqx/replayq", {tag, "0.3.2"}}} , {replayq, {git, "https://github.com/emqx/replayq", {tag, "0.3.2"}}}