diff options
| author | Jan Lehnardt <jan@apache.org> | 2010-02-28 02:41:52 +0000 |
|---|---|---|
| committer | Jan Lehnardt <jan@apache.org> | 2010-02-28 02:41:52 +0000 |
| commit | 1be99a1ef26c3d9233483cd7d0e0ff3f96ca8514 (patch) | |
| tree | a4268dc90249b6965658cf9def9cb1619c8115e4 /src/couchdb/couch_rep_changes_feed.erl | |
| parent | 5a9f96cf2646a0c9db468cd7876e75cdb9fda742 (diff) | |
Merge branch 'show-deleted-docs' into trunk
* show-deleted-docs:
treat deleted docs as nonexistant docs
Revert "Avoid replication task crashes by imporoving timeout handling."
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@917098 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_rep_changes_feed.erl')
| -rw-r--r-- | src/couchdb/couch_rep_changes_feed.erl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/couchdb/couch_rep_changes_feed.erl b/src/couchdb/couch_rep_changes_feed.erl index 343b445c..d6dd6d6a 100644 --- a/src/couchdb/couch_rep_changes_feed.erl +++ b/src/couchdb/couch_rep_changes_feed.erl @@ -83,7 +83,8 @@ init([_Parent, #http_db{}=Source, Since, PostProps] = Args) -> resource = "_changes", qs = QS, conn = Pid, - options = [{stream_to, {self(), once}}, {response_format, binary}], + options = [{stream_to, {self(), once}}, {response_format, binary}, + {inactivity_timeout, 31000}], % miss 3 heartbeats, assume death headers = Source#http_db.headers -- [{"Accept-Encoding", "gzip"}] }, {ibrowse_req_id, ReqId} = couch_rep_httpc:request(Req), @@ -202,9 +203,6 @@ handle_info({'EXIT', From, Reason}, #state{changes_loop=From} = State) -> ?LOG_ERROR("changes_loop died with reason ~p", [Reason]), {stop, changes_loop_died, State}; -handle_info({'EXIT', _From, normal}, State) -> - {noreply, State}; - handle_info(Msg, State) -> ?LOG_DEBUG("unexpected message at changes_feed ~p", [Msg]), {noreply, State}. |