Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5A5C710EB4 for ; Wed, 28 May 2014 22:45:08 +0000 (UTC) Received: (qmail 96388 invoked by uid 500); 28 May 2014 22:45:08 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 96252 invoked by uid 500); 28 May 2014 22:45:08 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 96142 invoked by uid 99); 28 May 2014 22:45:08 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 May 2014 22:45:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C6C674E8F3; Wed, 28 May 2014 22:45:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chewbranca@apache.org To: commits@couchdb.apache.org Date: Wed, 28 May 2014 22:45:14 -0000 Message-Id: <42327be19d6c48f7bf09dd375a960e5b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [8/9] chttpd commit: updated refs/heads/1843-feature-bigcouch-clustered-eventsource-changes-feed to 002a908 Send eventsource heartbeat event Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/f61dc27c Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/f61dc27c Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/f61dc27c Branch: refs/heads/1843-feature-bigcouch-clustered-eventsource-changes-feed Commit: f61dc27c7b084692c173e6be3b7e4dbd4ec82c00 Parents: c7f8eb7 Author: Russell Branca Authored: Tue May 27 15:47:05 2014 -0700 Committer: Russell Branca Committed: Wed May 28 15:44:57 2014 -0700 ---------------------------------------------------------------------- src/chttpd_db.erl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/f61dc27c/src/chttpd_db.erl ---------------------------------------------------------------------- diff --git a/src/chttpd_db.erl b/src/chttpd_db.erl index e62b106..e84bb15 100644 --- a/src/chttpd_db.erl +++ b/src/chttpd_db.erl @@ -106,7 +106,11 @@ changes_callback({change, {ChangeProp}=Change}, {"eventsource", Resp}) -> "\n", "id: ", ?JSON_ENCODE(Seq), "\n\n" ], - {ok, Resp1} = chttpd:send_delayed_chunk(Resp, [Chunk]), + {ok, Resp1} = chttpd:send_delayed_chunk(Resp, Chunk), + {ok, {"eventsource", Resp1}}; +changes_callback(timeout, {"eventsource", Resp}) -> + Chunk = "event: heartbeat\ndata: \n\n", + {ok, Resp1} = chttpd:send_delayed_chunk(Resp, Chunk), {ok, {"eventsource", Resp1}}; changes_callback({stop, _EndSeq}, {"eventsource", Resp}) -> chttpd:end_delayed_json_response(Resp);