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

fix(bridge): changes timeouts from 30s to 15s

This commit is contained in:
Shawn 2021-12-29 18:09:56 +08:00
parent aefcd6275b
commit 14089a572e
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx_bridge/etc/emqx_bridge.conf
View File

@ -34,8 +34,8 @@
# direction = egress # direction = egress
# ## NOTE: we cannot use placehodler variables in the `scheme://host:port` part of the url # ## NOTE: we cannot use placehodler variables in the `scheme://host:port` part of the url
# url = "http://localhost:9901/messages/${topic}" # url = "http://localhost:9901/messages/${topic}"
# request_timeout = "30s" # request_timeout = "15s"
# connect_timeout = "30s" # connect_timeout = "15s"
# max_retries = 3 # max_retries = 3
# retry_interval = "10s" # retry_interval = "10s"
# pool_type = "random" # pool_type = "random"

4
apps/emqx_bridge/src/emqx_bridge_api.erl
View File

@ -158,8 +158,8 @@ method_example(_Type, _Direction, put) ->
info_example_basic(http, _) -> info_example_basic(http, _) ->
#{ #{
url => <<"http://localhost:9901/messages/${topic}">>, url => <<"http://localhost:9901/messages/${topic}">>,
request_timeout => <<"30s">>, request_timeout => <<"15s">>,
connect_timeout => <<"30s">>, connect_timeout => <<"15s">>,
max_retries => 3, max_retries => 3,
retry_interval => <<"10s">>, retry_interval => <<"10s">>,
pool_type => <<"random">>, pool_type => <<"random">>,

2
apps/emqx_bridge/src/emqx_bridge_http_schema.erl
View File

@ -59,7 +59,7 @@ Template with variables is allowed.
""" """
})} })}
, {request_timeout, mk(emqx_schema:duration_ms(), , {request_timeout, mk(emqx_schema:duration_ms(),
#{ default => <<"30s">> #{ default => <<"15s">>
, desc =>""" , desc =>"""
How long will the HTTP request timeout. How long will the HTTP request timeout.
""" """

4
apps/emqx_connector/src/emqx_connector_api.erl
View File

@ -107,14 +107,14 @@ info_example_basic(mqtt) ->
#{ #{
mode => cluster_shareload, mode => cluster_shareload,
server => <<"127.0.0.1:1883">>, server => <<"127.0.0.1:1883">>,
reconnect_interval => <<"30s">>, reconnect_interval => <<"15s">>,
proto_ver => <<"v4">>, proto_ver => <<"v4">>,
username => <<"foo">>, username => <<"foo">>,
password => <<"bar">>, password => <<"bar">>,
clientid => <<"foo">>, clientid => <<"foo">>,
clean_start => true, clean_start => true,
keepalive => <<"300s">>, keepalive => <<"300s">>,
retry_interval => <<"30s">>, retry_interval => <<"15s">>,
max_inflight => 100, max_inflight => 100,
ssl => #{ ssl => #{
enable => false enable => false

2
apps/emqx_connector/src/emqx_connector_http.erl
View File

@ -75,7 +75,7 @@ For example: http://localhost:9901/
})} })}
, {connect_timeout, , {connect_timeout,
sc(emqx_schema:duration_ms(), sc(emqx_schema:duration_ms(),
#{ default => "30s" #{ default => "15s"
, desc => "The timeout when connecting to the HTTP server" , desc => "The timeout when connecting to the HTTP server"
})} })}
, {max_retries, , {max_retries,

4
apps/emqx_connector/src/mqtt/emqx_connector_mqtt_schema.erl
View File

@ -60,7 +60,7 @@ topic filters for 'remote_topic' of ingress connections.
#{ default => "127.0.0.1:1883" #{ default => "127.0.0.1:1883"
, desc => "The host and port of the remote MQTT broker" , 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, , {proto_ver,
sc(hoconsc:enum([v3, v4, v5]), sc(hoconsc:enum([v3, v4, v5]),
#{ default => v4 #{ 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" , desc => "The clean-start or the clean-session of the MQTT protocol"
})} })}
, {keepalive, mk_duration("keepalive", #{default => "300s"})} , {keepalive, mk_duration("keepalive", #{default => "300s"})}
, {retry_interval, mk_duration("retry interval", #{default => "30s"})} , {retry_interval, mk_duration("retry interval", #{default => "15s"})}
, {max_inflight, , {max_inflight,
sc(integer(), sc(integer(),
#{ default => 32 #{ default => 32