From 67e56658a75ea1cf2680a4cce1265272bddf5c1c Mon Sep 17 00:00:00 2001 From: JianBo He Date: Sat, 23 Jan 2021 18:47:28 +0800 Subject: [PATCH] fix(bridge-mqtt): fix bad time unit --- apps/emqx_bridge_mqtt/priv/emqx_bridge_mqtt.schema | 2 +- apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/emqx_bridge_mqtt/priv/emqx_bridge_mqtt.schema b/apps/emqx_bridge_mqtt/priv/emqx_bridge_mqtt.schema index 05c048d0a..72c0ff98e 100644 --- a/apps/emqx_bridge_mqtt/priv/emqx_bridge_mqtt.schema +++ b/apps/emqx_bridge_mqtt/priv/emqx_bridge_mqtt.schema @@ -100,7 +100,7 @@ {mapping, "bridge.mqtt.$name.retry_interval", "emqx_bridge_mqtt.bridges", [ {default, "20s"}, - {datatype, {duration, ms}} + {datatype, {duration, s}} ]}. {mapping, "bridge.mqtt.$name.max_inflight", "emqx_bridge_mqtt.bridges", [ diff --git a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl index 7708521e8..d63f20141 100644 --- a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl +++ b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt_actions.erl @@ -759,7 +759,7 @@ options(Options, PoolName) -> {username, str(Get(<<"username">>))}, {password, str(Get(<<"password">>))}, {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_opts, [{versions, tls_versions()}, {ciphers, ciphers(Get(<<"ciphers">>))},