You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2020/09/03 16:42:19 UTC
[couchdb] 01/02: buffer response before sending it
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a commit to branch improve_jwtf_keystore_error_handling
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 26be86b93798840e98d8b9b4ca1f3170a3b40f39
Author: Robert Newson <rn...@apache.org>
AuthorDate: Wed Sep 2 13:31:09 2020 +0100
buffer response before sending it
---
src/chttpd/src/chttpd.erl | 46 ++++++++++++++++------------------------------
1 file changed, 16 insertions(+), 30 deletions(-)
diff --git a/src/chttpd/src/chttpd.erl b/src/chttpd/src/chttpd.erl
index adde073..1343531 100644
--- a/src/chttpd/src/chttpd.erl
+++ b/src/chttpd/src/chttpd.erl
@@ -52,7 +52,7 @@
req,
code,
headers,
- first_chunk,
+ chunks,
resp=nil
}).
@@ -792,7 +792,7 @@ start_delayed_json_response(Req, Code, Headers, FirstChunk) ->
req = Req,
code = Code,
headers = Headers,
- first_chunk = FirstChunk}}.
+ chunks = [FirstChunk]}}.
start_delayed_chunked_response(Req, Code, Headers) ->
start_delayed_chunked_response(Req, Code, Headers, "").
@@ -803,13 +803,11 @@ start_delayed_chunked_response(Req, Code, Headers, FirstChunk) ->
req = Req,
code = Code,
headers = Headers,
- first_chunk = FirstChunk}}.
+ chunks = [FirstChunk]}}.
send_delayed_chunk(#delayed_resp{}=DelayedResp, Chunk) ->
- {ok, #delayed_resp{resp=Resp}=DelayedResp1} =
- start_delayed_response(DelayedResp),
- {ok, Resp} = send_chunk(Resp, Chunk),
- {ok, DelayedResp1}.
+ #delayed_resp{chunks = Chunks} = DelayedResp,
+ {ok, DelayedResp#delayed_resp{chunks = [Chunk | Chunks]}}.
send_delayed_last_chunk(Req) ->
send_delayed_chunk(Req, []).
@@ -817,11 +815,7 @@ send_delayed_last_chunk(Req) ->
send_delayed_error(#delayed_resp{req=Req,resp=nil}=DelayedResp, Reason) ->
{Code, ErrorStr, ReasonStr} = error_info(Reason),
{ok, Resp} = send_error(Req, Code, ErrorStr, ReasonStr),
- {ok, DelayedResp#delayed_resp{resp=Resp}};
-send_delayed_error(#delayed_resp{resp=Resp, req=Req}, Reason) ->
- update_timeout_stats(Reason, Req),
- log_error_with_stack_trace(Reason),
- throw({http_abort, Resp, Reason}).
+ {ok, DelayedResp#delayed_resp{resp=Resp}}.
close_delayed_json_object(Resp, Buffer, Terminator, 0) ->
% Use a separate chunk to close the streamed array to maintain strict
@@ -832,31 +826,23 @@ close_delayed_json_object(Resp, Buffer, Terminator, _Threshold) ->
send_delayed_chunk(Resp, [Buffer | Terminator]).
end_delayed_json_response(#delayed_resp{}=DelayedResp) ->
- {ok, #delayed_resp{resp=Resp}} =
- start_delayed_response(DelayedResp),
- end_json_response(Resp).
-
-get_delayed_req(#delayed_resp{req=#httpd{mochi_req=MochiReq}}) ->
- MochiReq;
-get_delayed_req(Resp) ->
- Resp:get(request).
-
-start_delayed_response(#delayed_resp{resp=nil}=DelayedResp) ->
#delayed_resp{
start_fun=StartFun,
req=Req,
code=Code,
headers=Headers,
- first_chunk=FirstChunk
+ chunks=Chunks
}=DelayedResp,
{ok, Resp} = StartFun(Req, Code, Headers),
- case FirstChunk of
- "" -> ok;
- _ -> {ok, Resp} = send_chunk(Resp, FirstChunk)
- end,
- {ok, DelayedResp#delayed_resp{resp=Resp}};
-start_delayed_response(#delayed_resp{}=DelayedResp) ->
- {ok, DelayedResp}.
+ lists:foreach(fun(Chunk) -> send_chunk(Resp, Chunk) end,
+ lists:reverse(Chunks)),
+ end_json_response(Resp).
+
+get_delayed_req(#delayed_resp{req=#httpd{mochi_req=MochiReq}}) ->
+ MochiReq;
+get_delayed_req(Resp) ->
+ Resp:get(request).
+
error_info({Error, Reason}) when is_list(Reason) ->
error_info({Error, couch_util:to_binary(Reason)});