diff options
| author | John Christopher Anderson <jchris@apache.org> | 2009-04-17 00:47:50 +0000 |
|---|---|---|
| committer | John Christopher Anderson <jchris@apache.org> | 2009-04-17 00:47:50 +0000 |
| commit | c0171495ea1cd8b552ae39a23ad584eec5190860 (patch) | |
| tree | 4ee79f4744bd1edda0215521977ce9151d8f2ec7 /src/couchdb/couch_httpd_view.erl | |
| parent | 47edd9d102446e0b0b661d7cc4a7b46eae6a9a5e (diff) | |
output errors differently during chunked responses (view and list)
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@765819 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_httpd_view.erl')
| -rw-r--r-- | src/couchdb/couch_httpd_view.erl | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/src/couchdb/couch_httpd_view.erl b/src/couchdb/couch_httpd_view.erl index f5f0f5f4..e0c3f631 100644 --- a/src/couchdb/couch_httpd_view.erl +++ b/src/couchdb/couch_httpd_view.erl @@ -20,7 +20,8 @@ -import(couch_httpd, [send_json/2,send_json/3,send_json/4,send_method_not_allowed/2,send_chunk/2, - start_json_response/2, start_json_response/3, end_json_response/1]). + start_json_response/2, start_json_response/3, end_json_response/1, + send_chunked_error/2]). design_doc_view(Req, Db, Id, ViewName, Keys) -> #view_query_args{ @@ -500,7 +501,7 @@ apply_default_helper_funs(#view_fold_helper_funs{ Helpers#view_fold_helper_funs{ passed_end = PassedEnd2, start_response = StartResp2, - send_row = SendRow2 + send_row = wrap_for_chunked_errors(SendRow2) }. apply_default_helper_funs(#reduce_fold_helper_funs{ @@ -519,7 +520,7 @@ apply_default_helper_funs(#reduce_fold_helper_funs{ Helpers#reduce_fold_helper_funs{ start_response = StartResp2, - send_row = SendRow2 + send_row = wrap_for_chunked_errors(SendRow2) }. make_passed_end_fun(fwd, EndKey, EndDocId, InclusiveEnd) -> @@ -578,6 +579,26 @@ send_json_reduce_row(Resp, {Key, Value}, RowFront) -> end, send_chunk(Resp, RowFront2 ++ ?JSON_ENCODE({[{key, Key}, {value, Value}]})). +wrap_for_chunked_errors(Fun) when is_function(Fun, 3)-> + fun(Resp, B, C) -> + try Fun(Resp, B, C) + catch + throw:Error -> + send_chunked_error(Resp, Error), + throw({already_sent, Error}) + end + end; + +wrap_for_chunked_errors(Fun) when is_function(Fun, 5)-> + fun(Resp, B, C, D, E) -> + try Fun(Resp, B, C, D, E) + catch + throw:Error -> + send_chunked_error(Resp, Error), + throw({already_sent, Error}) + end + end. + view_group_etag(Group) -> view_group_etag(Group, nil). |