diff --git a/apps/emqx_bridge/etc/emqx_bridge.conf b/apps/emqx_bridge/etc/emqx_bridge.conf index 04f4709b8..de931ae12 100644 --- a/apps/emqx_bridge/etc/emqx_bridge.conf +++ b/apps/emqx_bridge/etc/emqx_bridge.conf @@ -34,8 +34,8 @@ # direction = egress # ## NOTE: we cannot use placehodler variables in the `scheme://host:port` part of the url # url = "http://localhost:9901/messages/${topic}" -# request_timeout = "30s" -# connect_timeout = "30s" +# request_timeout = "15s" +# connect_timeout = "15s" # max_retries = 3 # retry_interval = "10s" # pool_type = "random" diff --git a/apps/emqx_bridge/src/emqx_bridge_api.erl b/apps/emqx_bridge/src/emqx_bridge_api.erl index 1358cccdc..4def97327 100644 --- a/apps/emqx_bridge/src/emqx_bridge_api.erl +++ b/apps/emqx_bridge/src/emqx_bridge_api.erl @@ -158,8 +158,8 @@ method_example(_Type, _Direction, put) -> info_example_basic(http, _) -> #{ url => <<"http://localhost:9901/messages/${topic}">>, - request_timeout => <<"30s">>, - connect_timeout => <<"30s">>, + request_timeout => <<"15s">>, + connect_timeout => <<"15s">>, max_retries => 3, retry_interval => <<"10s">>, pool_type => <<"random">>, diff --git a/apps/emqx_bridge/src/emqx_bridge_http_schema.erl b/apps/emqx_bridge/src/emqx_bridge_http_schema.erl index 540a6a070..a5937509c 100644 --- a/apps/emqx_bridge/src/emqx_bridge_http_schema.erl +++ b/apps/emqx_bridge/src/emqx_bridge_http_schema.erl @@ -59,7 +59,7 @@ Template with variables is allowed. """ })} , {request_timeout, mk(emqx_schema:duration_ms(), - #{ default => <<"30s">> + #{ default => <<"15s">> , desc =>""" How long will the HTTP request timeout. """ diff --git a/apps/emqx_connector/src/emqx_connector_api.erl b/apps/emqx_connector/src/emqx_connector_api.erl index c20632658..35e0c8ecb 100644 --- a/apps/emqx_connector/src/emqx_connector_api.erl +++ b/apps/emqx_connector/src/emqx_connector_api.erl @@ -107,14 +107,14 @@ info_example_basic(mqtt) -> #{ mode => cluster_shareload, server => <<"127.0.0.1:1883">>, - reconnect_interval => <<"30s">>, + reconnect_interval => <<"15s">>, proto_ver => <<"v4">>, username => <<"foo">>, password => <<"bar">>, clientid => <<"foo">>, clean_start => true, keepalive => <<"300s">>, - retry_interval => <<"30s">>, + retry_interval => <<"15s">>, max_inflight => 100, ssl => #{ enable => false diff --git a/apps/emqx_connector/src/emqx_connector_http.erl b/apps/emqx_connector/src/emqx_connector_http.erl index 2f72c869e..509e293cf 100644 --- a/apps/emqx_connector/src/emqx_connector_http.erl +++ b/apps/emqx_connector/src/emqx_connector_http.erl @@ -75,7 +75,7 @@ For example: http://localhost:9901/ })} , {connect_timeout, sc(emqx_schema:duration_ms(), - #{ default => "30s" + #{ default => "15s" , desc => "The timeout when connecting to the HTTP server" })} , {max_retries, diff --git a/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl b/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl index bee1861bd..303617a29 100644 --- a/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl +++ b/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl @@ -60,7 +60,7 @@ topic filters for 'remote_topic' of ingress connections. #{ default => "127.0.0.1:1883" , desc => "The host and port of the remote MQTT broker" })} - , {reconnect_interval, mk_duration("reconnect interval", #{default => "30s"})} + , {reconnect_interval, mk_duration("reconnect interval", #{default => "15s"})} , {proto_ver, sc(hoconsc:enum([v3, v4, v5]), #{ default => v4 @@ -82,7 +82,7 @@ topic filters for 'remote_topic' of ingress connections. , desc => "The clean-start or the clean-session of the MQTT protocol" })} , {keepalive, mk_duration("keepalive", #{default => "300s"})} - , {retry_interval, mk_duration("retry interval", #{default => "30s"})} + , {retry_interval, mk_duration("retry interval", #{default => "15s"})} , {max_inflight, sc(integer(), #{ default => 32