From b5f63f4151d69817b942757e173bda56aba5999a Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Tue, 23 May 2023 14:50:19 -0300 Subject: [PATCH 1/2] test: fix wrong test listeners option --- apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl b/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl index 49ddd19bd..86f088855 100644 --- a/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl +++ b/apps/emqx_bridge/test/emqx_bridge_api_SUITE.erl @@ -161,7 +161,7 @@ init_node(Type) -> primary -> ok = emqx_config:put( [dashboard, listeners], - #{http => #{enable => true, bind => 18083}, proxy_header => false} + #{http => #{enable => true, bind => 18083, proxy_header => false}} ), ok = emqx_dashboard:start_listeners(), ready = emqx_dashboard_listener:regenerate_minirest_dispatch(), From 44ed6a19ee1f41f23d130ec674bb13ca9a51daf6 Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Tue, 23 May 2023 11:22:48 -0300 Subject: [PATCH 2/2] fix(bridge): pass resource option `request_timeout = infinity` along to buffer workers (r5.0) --- apps/emqx_bridge/src/emqx_bridge.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx_bridge/src/emqx_bridge.erl b/apps/emqx_bridge/src/emqx_bridge.erl index 3aade0369..1fbd6902e 100644 --- a/apps/emqx_bridge/src/emqx_bridge.erl +++ b/apps/emqx_bridge/src/emqx_bridge.erl @@ -211,7 +211,7 @@ send_message(BridgeId, Message) -> query_opts(Config) -> 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 #{timeout => Timeout}; _ ->