diff options
author | Jan Lehnardt <jan@apache.org> | 2010-02-28 02:45:53 +0000 |
---|---|---|
committer | Jan Lehnardt <jan@apache.org> | 2010-02-28 02:45:53 +0000 |
commit | 89bc74477df2cb0b123d1b7e0d4a9b8cda0a6c9f (patch) | |
tree | aca872035e7c6c5191c026dee592e1d5104432ac /src/couchdb/couch_rep_att.erl | |
parent | 1be99a1ef26c3d9233483cd7d0e0ff3f96ca8514 (diff) |
revert accidental commit
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@917102 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_rep_att.erl')
-rw-r--r-- | src/couchdb/couch_rep_att.erl | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/src/couchdb/couch_rep_att.erl b/src/couchdb/couch_rep_att.erl index 6b576a01..ee4f0184 100644 --- a/src/couchdb/couch_rep_att.erl +++ b/src/couchdb/couch_rep_att.erl @@ -25,7 +25,11 @@ convert_stub(#att{data=stub, name=Name} = Attachment, qs = [{rev, couch_doc:rev_to_str({Pos,RevId})}] }, Ref = make_ref(), - RcvFun = fun() -> attachment_receiver(Ref, Request) end, + RcvFun = fun() -> + Bin = attachment_receiver(Ref, Request), + cleanup(), + Bin + end, Attachment#att{data=RcvFun}. cleanup() -> @@ -34,6 +38,8 @@ cleanup() -> %% TODO maybe log, didn't expect to have data here cleanup(); {ibrowse_async_response_end, _} -> + cleanup(); + {ibrowse_async_headers, _, _, _} -> cleanup() after 0 -> erase(), @@ -43,13 +49,27 @@ cleanup() -> % internal funs attachment_receiver(Ref, Request) -> - case get(Ref) of + try case get(Ref) of undefined -> {ReqId, ContentEncoding} = start_http_request(Request), put(Ref, {ReqId, ContentEncoding}), receive_data(Ref, ReqId, ContentEncoding); {ReqId, ContentEncoding} -> receive_data(Ref, ReqId, ContentEncoding) + end + catch + throw:{attachment_request_failed, timeout} -> + case {Request#http_db.retries, Request#http_db.pause} of + {0, _} -> + ?LOG_INFO("request for ~p failed", [Request#http_db.resource]), + throw({attachment_request_failed, max_retries_reached}); + {N, Pause} when N > 0 -> + ?LOG_INFO("request for ~p timed out, retrying in ~p seconds", + [Request#http_db.resource, Pause/1000]), + timer:sleep(Pause), + cleanup(), + attachment_receiver(Ref, Request#http_db{retries = N-1}) + end end. receive_data(Ref, ReqId, ContentEncoding) -> @@ -71,6 +91,8 @@ receive_data(Ref, ReqId, ContentEncoding) -> {ibrowse_async_response_end, ReqId} -> ?LOG_ERROR("streaming att. ended but more data requested ~p", [ReqId]), throw({attachment_request_failed, premature_end}) + after 31000 -> + throw({attachment_request_failed, timeout}) end. start_http_request(Req) -> @@ -84,6 +106,8 @@ start_http_request(Req) -> {ok, ContentEncoding, NewReqId} -> {NewReqId, ContentEncoding} end + after 10000 -> + throw({attachment_request_failed, timeout}) end. validate_headers(_Req, 200, Headers) -> |