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

fix: allow to pass in Opts rather than just a ReplyTo

This commit is contained in:
Stefan Strigler 2023-06-28 16:17:36 +02:00
parent 40dd34a704
commit d71d70c889
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/emqx_bridge/src/emqx_bridge.erl
View File

@ -220,15 +220,14 @@ send_to_matched_egress_bridges(Topic, Msg) ->
send_message(BridgeId, Message) ->
{BridgeType, BridgeName} = emqx_bridge_resource:parse_bridge_id(BridgeId),
ResId = emqx_bridge_resource:resource_id(BridgeType, BridgeName),
send_message(BridgeType, BridgeName, ResId, Message, undefined).
send_message(BridgeType, BridgeName, ResId, Message, #{}).
send_message(BridgeType, BridgeName, ResId, Message, ReplyTo) ->
send_message(BridgeType, BridgeName, ResId, Message, QueryOpts0) ->
case emqx:get_config([?ROOT_KEY, BridgeType, BridgeName], not_found) of
not_found ->
{error, bridge_not_found};
#{enable := true} = Config ->
QueryOpts0 = query_opts(Config),
QueryOpts = QueryOpts0#{reply_to => ReplyTo},
QueryOpts = maps:merge(query_opts(Config), QueryOpts0),
emqx_resource:query(ResId, {send_message, Message}, QueryOpts);
#{enable := false} ->
{error, bridge_stopped}

4
apps/emqx_rule_engine/src/emqx_rule_runtime.erl
View File

@ -351,7 +351,9 @@ do_handle_action(RuleId, {bridge, BridgeType, BridgeName, ResId}, Selected, _Env
#{bridge_id => emqx_bridge_resource:bridge_id(BridgeType, BridgeName)}
),
ReplyTo = {fun ?MODULE:inc_action_metrics/2, [RuleId]},
case emqx_bridge:send_message(BridgeType, BridgeName, ResId, Selected, ReplyTo) of
case
emqx_bridge:send_message(BridgeType, BridgeName, ResId, Selected, #{reply_to => ReplyTo})
of
{error, Reason} when Reason == bridge_not_found; Reason == bridge_stopped ->
throw(out_of_service);
Result ->