Merge pull request #263 from emqx/fix/http-request

fix(http request): catch error when gen_server:call timed out and retry when disconnected due to keepalive
emqx · Jun 28, 2021 · d52202c · d52202c
2 parents 40da87f + b0c6120
commit d52202c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/src/emqx_auth_http.appup.src b/src/emqx_auth_http.appup.src
@@ -1,7 +1,7 @@
 %% -*-: erlang -*-
 {VSN,
   [
-    {<<"4.2.([7-9]|(10))">>, [
+    {<<"4.2.([7-9]|(10)|(11)|(12))">>, [
       {load_module, emqx_http_client, brutal_purge, soft_purge, []}
     ]},
     {"4.2.6", [
@@ -14,7 +14,7 @@
     {<<".*">>, []}
   ],
   [
-    {<<"4.2.([7-9]|(10))">>, [
+    {<<"4.2.([7-9]|(10)|(11)|(12))">>, [
       {load_module, emqx_http_client, brutal_purge, soft_purge, []}
     ]},
     {"4.2.6", [
@@ -26,4 +26,4 @@
     ]},
     {<<".*">>, []}
   ]
-}.
+}.
diff --git a/src/emqx_http_client.erl b/src/emqx_http_client.erl
@@ -39,12 +39,13 @@ start_link(Pool, Id, Opts) ->
     gen_server:start_link(?MODULE, [Pool, Id, Opts], []).
 
 request(Method, Pool, Req) ->
-    request(Method, Pool, Req, 5000).
+    request(Method, Pool, Req, 5000, 3).
 
-request(get, Pool, {Path, Headers}, Timeout) ->
-    call(pick(Pool), {get, {Path, Headers}, Timeout}, Timeout + 1000);
-request(Method, Pool, {Path, Headers, Body}, Timeout) ->
-    call(pick(Pool), {Method, {Path, Headers, Body}, Timeout}, Timeout + 1000).
+request(Method, Pool, Req, Timeout) ->
+    request(Method, Pool, Req, Timeout, 3).
+
+request(Method, Pool, Req, Timeout, Retry) ->
+    request_(pick(Pool), Method, Req, Timeout, Retry).
 
 %%--------------------------------------------------------------------
 %% gen_server callbacks
@@ -234,8 +235,20 @@ gun_opts([{transport_opts, TransportOpts} | Opts], Acc) ->
 gun_opts([_ | Opts], Acc) ->
     gun_opts(Opts, Acc).
 
-call(ChannPid, Msg, Timeout) ->
-    gen_server:call(ChannPid, Msg, Timeout).
+request_(_Worker, _Method, _Req, _Timeout, 0) ->
+    {error, normal};
+request_(Worker, Method, Req, Timeout, Retry) ->
+    try gen_server:call(Worker,  {Method, Req, Timeout}, Timeout + 1000) of
+        {error, normal} ->
+            request_(Worker, Method, Req, Timeout, Retry - 1);
+        {error, Reason} ->
+            {error, Reason};
+        Other ->
+            Other
+    catch
+        exit:{timeout, _Details} ->
+            {error, timeout}
+    end.
 
 pick(Pool) ->
     gproc_pool:pick_worker(Pool).
@@ -255,4 +268,4 @@ flush_stream(Client, StreamRef) ->
             flush_stream(Client, StreamRef)
 	after 0 ->
 		ok
-	end.
+	end.