diff options
| author | Jan Lehnardt <jan@apache.org> | 2010-03-01 07:46:53 +0000 |
|---|---|---|
| committer | Jan Lehnardt <jan@apache.org> | 2010-03-01 07:46:53 +0000 |
| commit | 7be616679cefe6850e9ba7ab0d46b5a9880e5fae (patch) | |
| tree | fb25739fa765cfba9ab40c40aebffa845964c108 /src/couchdb/couch_rep_changes_feed.erl | |
| parent | 12417e6faecc72fe53d858390f9c84c379b8baed (diff) | |
Undo accidental revert. Sorry for the mess SVN acted weird on me. Probably due to the LDAP infra issues.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@917411 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, 4 insertions, 2 deletions
diff --git a/src/couchdb/couch_rep_changes_feed.erl b/src/couchdb/couch_rep_changes_feed.erl index d6dd6d6a..343b445c 100644 --- a/src/couchdb/couch_rep_changes_feed.erl +++ b/src/couchdb/couch_rep_changes_feed.erl @@ -83,8 +83,7 @@ init([_Parent, #http_db{}=Source, Since, PostProps] = Args) -> resource = "_changes", qs = QS, conn = Pid, - options = [{stream_to, {self(), once}}, {response_format, binary}, - {inactivity_timeout, 31000}], % miss 3 heartbeats, assume death + options = [{stream_to, {self(), once}}, {response_format, binary}], headers = Source#http_db.headers -- [{"Accept-Encoding", "gzip"}] }, {ibrowse_req_id, ReqId} = couch_rep_httpc:request(Req), @@ -203,6 +202,9 @@ 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}. |