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

Merge pull request #10791 from thalesmg/fix-bridge-infinity-timeout-r50 

fix(bridge): pass resource option `request_timeout = infinity` along to buffer workers (r5.0)
This commit is contained in:
Zaiming (Stone) Shi 2023-05-24 08:46:43 +02:00 committed by GitHub
parent 0d3de36f4d 44ed6a19ee
commit 9363ca5846
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/src/emqx_bridge.erl
View File

@ -211,7 +211,7 @@ send_message(BridgeId, Message) ->
query_opts(Config) -> query_opts(Config) ->
case emqx_utils_maps:deep_get([resource_opts, request_timeout], Config, false) of case emqx_utils_maps:deep_get([resource_opts, request_timeout], Config, false) of
Timeout when is_integer(Timeout) -> Timeout when is_integer(Timeout) orelse Timeout =:= infinity ->
%% request_timeout is configured %% request_timeout is configured
#{timeout => Timeout}; #{timeout => Timeout};
_ -> _ ->

2
apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl
View File

@ -161,7 +161,7 @@ init_node(Type) ->
primary -> primary ->
ok = emqx_config:put( ok = emqx_config:put(
[dashboard, listeners], [dashboard, listeners],
#{http => #{enable => true, bind => 18083}, proxy_header => false} #{http => #{enable => true, bind => 18083, proxy_header => false}}
), ),
ok = emqx_dashboard:start_listeners(), ok = emqx_dashboard:start_listeners(),
ready = emqx_dashboard_listener:regenerate_minirest_dispatch(), ready = emqx_dashboard_listener:regenerate_minirest_dispatch(),