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

feat: add stop after render and after render trace to mysql action

This commit is contained in:
Kjell Winblad 2024-04-23 15:54:46 +02:00
parent b2811f96b2
commit 120b35ac75
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/emqx_bridge_mysql/src/emqx_bridge_mysql_connector.erl
View File

@ -104,10 +104,12 @@ on_query(
#{channels := Channels, connector_state := ConnectorState} #{channels := Channels, connector_state := ConnectorState}
) when is_binary(Channel) -> ) when is_binary(Channel) ->
ChannelConfig = maps:get(Channel, Channels), ChannelConfig = maps:get(Channel, Channels),
MergedState0 = maps:merge(ConnectorState, ChannelConfig),
MergedState1 = MergedState0#{channel_id => Channel},
Result = emqx_mysql:on_query( Result = emqx_mysql:on_query(
InstanceId, InstanceId,
Request, Request,
maps:merge(ConnectorState, ChannelConfig) MergedState1
), ),
?tp(mysql_connector_on_query_return, #{instance_id => InstanceId, result => Result}), ?tp(mysql_connector_on_query_return, #{instance_id => InstanceId, result => Result}),
Result; Result;
@ -121,10 +123,12 @@ on_batch_query(
) when is_binary(element(1, Req)) -> ) when is_binary(element(1, Req)) ->
Channel = element(1, Req), Channel = element(1, Req),
ChannelConfig = maps:get(Channel, Channels), ChannelConfig = maps:get(Channel, Channels),
MergedState0 = maps:merge(ConnectorState, ChannelConfig),
MergedState1 = MergedState0#{channel_id => Channel},
Result = emqx_mysql:on_batch_query( Result = emqx_mysql:on_batch_query(
InstanceId, InstanceId,
BatchRequest, BatchRequest,
maps:merge(ConnectorState, ChannelConfig) MergedState1
), ),
?tp(mysql_connector_on_batch_query_return, #{instance_id => InstanceId, result => Result}), ?tp(mysql_connector_on_batch_query_return, #{instance_id => InstanceId, result => Result}),
Result; Result;

2
apps/emqx_mysql/src/emqx_mysql.app.src
View File

@ -1,6 +1,6 @@
{application, emqx_mysql, [ {application, emqx_mysql, [
{description, "EMQX MySQL Database Connector"}, {description, "EMQX MySQL Database Connector"},
{vsn, "0.1.8"}, {vsn, "0.1.9"},
{registered, []}, {registered, []},
{applications, [ {applications, [
kernel, kernel,

2
apps/emqx_mysql/src/emqx_mysql.erl
View File

@ -498,6 +498,8 @@ on_sql_query(
) -> ) ->
LogMeta = #{connector => InstId, sql => SQLOrKey, state => State}, LogMeta = #{connector => InstId, sql => SQLOrKey, state => State},
?TRACE("QUERY", "mysql_connector_received", LogMeta), ?TRACE("QUERY", "mysql_connector_received", LogMeta),
ChannelID = maps:get(channel_id, State, no_channel),
emqx_trace:rendered_action_template(ChannelID, #{sql => SQLOrKey}),
Worker = ecpool:get_client(PoolName), Worker = ecpool:get_client(PoolName),
case ecpool_worker:client(Worker) of case ecpool_worker:client(Worker) of
{ok, Conn} -> {ok, Conn} ->