diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config index 5a68f658e..3aa80c416 100644 --- a/apps/emqx/rebar.config +++ b/apps/emqx/rebar.config @@ -15,7 +15,6 @@ , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.0"}}} , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.10.3"}}} , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.5.1"}}} - , {cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v4.0.1"}}} %% todo delete when plugins use hocon , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.9.6"}}} , {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}} , {recon, {git, "https://github.com/ferd/recon", {tag, "2.5.1"}}} diff --git a/apps/emqx_rule_actions/src/emqx_bridge_mqtt_actions.erl b/apps/emqx_rule_actions/src/emqx_bridge_mqtt_actions.erl index 80f51d2cc..d61706893 100644 --- a/apps/emqx_rule_actions/src/emqx_bridge_mqtt_actions.erl +++ b/apps/emqx_rule_actions/src/emqx_bridge_mqtt_actions.erl @@ -119,10 +119,9 @@ }, disk_cache => #{ order => 8, - type => string, + type => boolean, required => false, - default => <<"off">>, - enum => [<<"on">>, <<"off">>], + default => false, title => #{en => <<"Disk Cache">>, zh => <<"磁盘缓存"/utf8>>}, description => #{en => <<"The flag which determines whether messages " @@ -300,10 +299,9 @@ }, disk_cache => #{ order => 6, - type => string, + type => boolean, required => false, - default => <<"off">>, - enum => [<<"on">>, <<"off">>], + default => false, title => #{en => <<"Disk Cache">>, zh => <<"磁盘缓存"/utf8>>}, description => #{en => <<"The flag which determines whether messages " @@ -538,9 +536,9 @@ options(Options, PoolName, ResId) -> Address = Get(<<"address">>), [{max_inflight_batches, 32}, {forward_mountpoint, str(Get(<<"mountpoint">>))}, - {disk_cache, cuttlefish_flag:parse(str(GetD(<<"disk_cache">>, "off")))}, + {disk_cache, GetD(<<"disk_cache">>, false)}, {start_type, auto}, - {reconnect_delay_ms, cuttlefish_duration:parse(str(Get(<<"reconnect_interval">>)), ms)}, + {reconnect_delay_ms, hocon_postprocess:duration(str(Get(<<"reconnect_interval">>)))}, {if_record_metrics, false}, {pool_size, GetD(<<"pool_size">>, 1)}, {pool_name, PoolName} @@ -556,11 +554,11 @@ options(Options, PoolName, ResId) -> {clientid, str(Get(<<"clientid">>))}, {append, Get(<<"append">>)}, {connect_module, emqx_bridge_mqtt}, - {keepalive, cuttlefish_duration:parse(str(Get(<<"keepalive">>)), s)}, + {keepalive, hocon_postprocess:duration(str(Get(<<"keepalive">>))) div 1000}, {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")), s)} + {retry_interval, hocon_postprocess:duration(str(GetD(<<"retry_interval">>, "30s"))) div 1000} | maybe_ssl(Options, Get(<<"ssl">>), ResId)] end. diff --git a/apps/emqx_rule_actions/src/emqx_web_hook_actions.erl b/apps/emqx_rule_actions/src/emqx_web_hook_actions.erl index 8bb1c7de0..ef21ab864 100644 --- a/apps/emqx_rule_actions/src/emqx_web_hook_actions.erl +++ b/apps/emqx_rule_actions/src/emqx_web_hook_actions.erl @@ -295,7 +295,7 @@ parse_action_params(Params = #{<<"url">> := URL}) -> path => merge_path(CommonPath, maps:get(<<"path">>, Params, <<>>)), headers => NHeaders, body => maps:get(<<"body">>, Params, <<>>), - request_timeout => cuttlefish_duration:parse(str(maps:get(<<"request_timeout">>, Params, <<"5s">>))), + request_timeout => hocon_postprocess:duration(str(maps:get(<<"request_timeout">>, Params, <<"5s">>))), pool => maps:get(<<"pool">>, Params)} catch _:_ -> throw({invalid_params, Params}) @@ -338,7 +338,7 @@ pool_opts(Params = #{<<"url">> := URL}, ResId) -> scheme := Scheme}} = emqx_http_lib:uri_parse(URL), PoolSize = maps:get(<<"pool_size">>, Params, 32), ConnectTimeout = - cuttlefish_duration:parse(str(maps:get(<<"connect_timeout">>, Params, <<"5s">>))), + hocon_postprocess:duration(str(maps:get(<<"connect_timeout">>, Params, <<"5s">>))), TransportOpts0 = case Scheme =:= https of true -> [get_ssl_opts(Params, ResId)]; diff --git a/rebar.config b/rebar.config index 4cad496d6..77e98ce68 100644 --- a/rebar.config +++ b/rebar.config @@ -50,7 +50,6 @@ , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.0"}}} , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.10.3"}}} , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.5.1"}}} - , {cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v4.0.1"}}} % TODO: delete when all apps moved to hocon , {minirest, {git, "https://github.com/emqx/minirest", {tag, "1.1.2"}}} , {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.1"}}} , {replayq, {git, "https://github.com/emqx/replayq", {tag, "0.3.2"}}} diff --git a/rebar.config.erl b/rebar.config.erl index 258cd0bf3..ad07d50a3 100644 --- a/rebar.config.erl +++ b/rebar.config.erl @@ -261,7 +261,6 @@ relx_apps(ReleaseType) -> , inets , compiler , runtime_tools - , cuttlefish , emqx , {mnesia, load} , {ekka, load}