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

fix(bridge-mqtt): fix bad time unit

This commit is contained in:
JianBo He 2021-01-23 18:47:28 +08:00 committed by turtleDeng
parent 3de8fea435
commit 67e56658a7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_bridge_mqtt/priv/emqx_bridge_mqtt.schema
View File

@ -100,7 +100,7 @@
{mapping, "bridge.mqtt.$name.retry_interval", "emqx_bridge_mqtt.bridges", [ {mapping, "bridge.mqtt.$name.retry_interval", "emqx_bridge_mqtt.bridges", [
{default, "20s"}, {default, "20s"},
{datatype, {duration, ms}} {datatype, {duration, s}}
]}. ]}.
{mapping, "bridge.mqtt.$name.max_inflight", "emqx_bridge_mqtt.bridges", [ {mapping, "bridge.mqtt.$name.max_inflight", "emqx_bridge_mqtt.bridges", [

2
apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl
View File

@ -759,7 +759,7 @@ options(Options, PoolName) ->
{username, str(Get(<<"username">>))}, {username, str(Get(<<"username">>))},
{password, str(Get(<<"password">>))}, {password, str(Get(<<"password">>))},
{proto_ver, mqtt_ver(Get(<<"proto_ver">>))}, {proto_ver, mqtt_ver(Get(<<"proto_ver">>))},
{retry_interval, cuttlefish_duration:parse(str(GetD(<<"retry_interval">>, "30s")), ms)}, {retry_interval, cuttlefish_duration:parse(str(GetD(<<"retry_interval">>, "30s")), s)},
{ssl, cuttlefish_flag:parse(str(Get(<<"ssl">>)))}, {ssl, cuttlefish_flag:parse(str(Get(<<"ssl">>)))},
{ssl_opts, [{versions, tls_versions()}, {ssl_opts, [{versions, tls_versions()},
{ciphers, ciphers(Get(<<"ciphers">>))}, {ciphers, ciphers(Get(<<"ciphers">>))},