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

Merge pull request #10562 from thalesmg/fix-webhook-async-shutdown-normal-reply-r50 

fix(webhook): treat `{shutdown, normal}` and `{closed, _}` async replies as retriable
This commit is contained in:
Thales Macedo Garitezi 2023-05-02 10:08:18 -03:00 committed by GitHub
parent 0fd5fee4ca a19621e533
commit 654d274039
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
apps/emqx_connector/src/emqx_connector_http.erl
View File

@ -306,7 +306,20 @@ on_query(
Retry
)
of
{error, Reason} when Reason =:= econnrefused; Reason =:= timeout ->
{error, Reason} when
Reason =:= econnrefused;
Reason =:= timeout;
Reason =:= {shutdown, normal};
Reason =:= {shutdown, closed}
->
?SLOG(warning, #{
msg => "http_connector_do_request_failed",
reason => Reason,
connector => InstId
}),
{error, {recoverable_error, Reason}};
{error, {closed, _Message} = Reason} ->
%% _Message = "The connection was lost."
?SLOG(warning, #{
msg => "http_connector_do_request_failed",
reason => Reason,
@ -568,7 +581,16 @@ reply_delegator(ReplyFunAndArgs, Result) ->
case Result of
%% The normal reason happens when the HTTP connection times out before
%% the request has been fully processed
{error, Reason} when Reason =:= econnrefused; Reason =:= timeout; Reason =:= normal ->
{error, Reason} when
Reason =:= econnrefused;
Reason =:= timeout;
Reason =:= normal;
Reason =:= {shutdown, normal}
->
Result1 = {error, {recoverable_error, Reason}},
emqx_resource:apply_reply_fun(ReplyFunAndArgs, Result1);
{error, {closed, _Message} = Reason} ->
%% _Message = "The connection was lost."
Result1 = {error, {recoverable_error, Reason}},
emqx_resource:apply_reply_fun(ReplyFunAndArgs, Result1);
_ ->