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

Merge pull request #9035 from terry-xiaoyu/review_changes 

fix(bridges): some issues found in code review
This commit is contained in:
Xinyu Liu 2022-09-23 18:49:58 +08:00 committed by GitHub
parent f424c411ff d24441b204
commit 83a3d836b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx_bridge/i18n/emqx_bridge_schema.conf
View File

@ -173,8 +173,8 @@ emqx_bridge_schema {
} }
metric_retried { metric_retried {
desc { desc {
en: """Times of retried from the queue or the inflight window.""" en: """Times of retried."""
zh: """从队列或者飞行窗口里重试的次数。""" zh: """重试的次数。"""
} }
label: { label: {
en: "Retried" en: "Retried"

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

@ -249,19 +249,19 @@ remove(BridgeType, BridgeName) ->
). ).
check_deps_and_remove(BridgeType, BridgeName, RemoveDeps) -> check_deps_and_remove(BridgeType, BridgeName, RemoveDeps) ->
Id = emqx_bridge_resource:bridge_id(BridgeType, BridgeName), BridgeId = emqx_bridge_resource:bridge_id(BridgeType, BridgeName),
%% NOTE: This violates the design: Rule depends on data-bridge but not vice versa. %% NOTE: This violates the design: Rule depends on data-bridge but not vice versa.
case emqx_rule_engine:get_rule_ids_by_action(Id) of case emqx_rule_engine:get_rule_ids_by_action(BridgeId) of
[] -> [] ->
remove(BridgeType, BridgeName); remove(BridgeType, BridgeName);
Rules when RemoveDeps =:= false -> RuleIds when RemoveDeps =:= false ->
{error, {rules_deps_on_this_bridge, Rules}}; {error, {rules_deps_on_this_bridge, RuleIds}};
Rules when RemoveDeps =:= true -> RuleIds when RemoveDeps =:= true ->
lists:foreach( lists:foreach(
fun(R) -> fun(R) ->
emqx_rule_engine:ensure_action_removed(R, Id) emqx_rule_engine:ensure_action_removed(R, BridgeId)
end, end,
Rules RuleIds
), ),
remove(BridgeType, BridgeName) remove(BridgeType, BridgeName)
end. end.

2
apps/emqx_bridge/src/emqx_bridge_api.erl
View File

@ -331,7 +331,7 @@ schema("/bridges/:id") ->
responses => #{ responses => #{
204 => <<"Bridge deleted">>, 204 => <<"Bridge deleted">>,
400 => error_schema(['INVALID_ID'], "Update bridge failed"), 400 => error_schema(['INVALID_ID'], "Update bridge failed"),
403 => error_schema('FORBIDDEN_REQUEST', "forbidden operation"), 403 => error_schema('FORBIDDEN_REQUEST', "Forbidden operation"),
503 => error_schema('SERVICE_UNAVAILABLE', "Service unavailable") 503 => error_schema('SERVICE_UNAVAILABLE', "Service unavailable")
} }
} }