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

chore: fix compile warnings

This commit is contained in:
JianBo He 2023-11-20 10:39:57 +08:00
parent 96af7a74e8
commit 8954450c0b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx_bridge_http/src/emqx_bridge_http_connector.erl
View File

@ -281,7 +281,7 @@ on_stop(InstId, _State) ->
Res. Res.
on_remove_channel( on_remove_channel(
InstId, _InstId,
OldState = #{installed_actions := InstalledActions}, OldState = #{installed_actions := InstalledActions},
ActionId ActionId
) -> ) ->
@ -646,7 +646,7 @@ process_request_and_action(Request, ActionState, Msg) ->
), ),
HeadersTemplate1 = maps:get(headers, Request), HeadersTemplate1 = maps:get(headers, Request),
HeadersTemplate2= maps:get(headers, ActionState), HeadersTemplate2 = maps:get(headers, ActionState),
Headers = merge_proplist( Headers = merge_proplist(
render_headers(HeadersTemplate1, Msg), render_headers(HeadersTemplate1, Msg),
render_headers(HeadersTemplate2, Msg) render_headers(HeadersTemplate2, Msg)

8
apps/emqx_bridge_http/src/emqx_bridge_http_schema.erl
View File

@ -123,7 +123,7 @@ fields("config_connector") ->
default => true default => true
} }
)} )}
] ++ connector_opts_1() ++ connector_opts_0(); ] ++ connector_url_headers() ++ connector_opts();
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% v1/v2 %% v1/v2
fields("resource_opts") -> fields("resource_opts") ->
@ -155,7 +155,7 @@ basic_config() ->
default => true default => true
} }
)} )}
] ++ webhook_resource_opts() ++ connector_opts_0(). ] ++ webhook_resource_opts() ++ connector_opts().
request_config() -> request_config() ->
[ [
@ -202,7 +202,7 @@ request_config() ->
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% helpers for v2 only %% helpers for v2 only
connector_opts_1() -> connector_url_headers() ->
[url_field(), headers_field()]. [url_field(), headers_field()].
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
@ -287,7 +287,7 @@ webhook_resource_opts() ->
)} )}
]. ].
connector_opts_0() -> connector_opts() ->
mark_request_field_deperecated( mark_request_field_deperecated(
proplists:delete(max_retries, emqx_bridge_http_connector:fields(config)) proplists:delete(max_retries, emqx_bridge_http_connector:fields(config))
). ).