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

fix(bridge_api): fix response status code for some operations

This commit is contained in:
Thales Macedo Garitezi 2023-10-31 10:40:56 -03:00
parent c90ca1ea53
commit 84e78f5d2e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -387,6 +387,7 @@ schema("/bridges/:id/enable/:enable") ->
responses => responses =>
#{ #{
204 => <<"Success">>, 204 => <<"Success">>,
400 => error_schema('BAD_REQUEST', non_compat_bridge_msg()),
404 => error_schema('NOT_FOUND', "Bridge not found or invalid operation"), 404 => error_schema('NOT_FOUND', "Bridge not found or invalid operation"),
503 => error_schema('SERVICE_UNAVAILABLE', "Service unavailable") 503 => error_schema('SERVICE_UNAVAILABLE', "Service unavailable")
} }
@ -667,6 +668,10 @@ get_metrics_from_local_node(BridgeType0, BridgeName) ->
?SERVICE_UNAVAILABLE(<<"request timeout">>); ?SERVICE_UNAVAILABLE(<<"request timeout">>);
{error, timeout} -> {error, timeout} ->
?SERVICE_UNAVAILABLE(<<"request timeout">>); ?SERVICE_UNAVAILABLE(<<"request timeout">>);
{error, not_bridge_v1_compatible} ->
?BAD_REQUEST(non_compat_bridge_msg());
{error, bridge_not_found} ->
?BRIDGE_NOT_FOUND(BridgeType, BridgeName);
{error, Reason} -> {error, Reason} ->
?INTERNAL_ERROR(Reason) ?INTERNAL_ERROR(Reason)
end end

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

@ -394,7 +394,7 @@ schema("/bridges_v2_probe") ->
case emqx_bridge_v2:disable_enable(enable_func(Enable), BridgeType, BridgeName) of case emqx_bridge_v2:disable_enable(enable_func(Enable), BridgeType, BridgeName) of
{ok, _} -> {ok, _} ->
?NO_CONTENT; ?NO_CONTENT;
{error, {pre_config_update, _, not_found}} -> {error, {pre_config_update, _, bridge_not_found}} ->
?BRIDGE_NOT_FOUND(BridgeType, BridgeName); ?BRIDGE_NOT_FOUND(BridgeType, BridgeName);
{error, {_, _, timeout}} -> {error, {_, _, timeout}} ->
?SERVICE_UNAVAILABLE(<<"request timeout">>); ?SERVICE_UNAVAILABLE(<<"request timeout">>);