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 8FA6711C7B for ; Thu, 28 Aug 2014 12:23:12 +0000 (UTC) Received: (qmail 50940 invoked by uid 500); 28 Aug 2014 12:23:11 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 50740 invoked by uid 500); 28 Aug 2014 12:23:11 -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 50181 invoked by uid 99); 28 Aug 2014 12:23:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Aug 2014 12:23:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2E939A02E26; Thu, 28 Aug 2014 12:23:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rnewson@apache.org To: commits@couchdb.apache.org Date: Thu, 28 Aug 2014 12:23:17 -0000 Message-Id: <9486cd9b348f4bf987ec048ab60117b1@git.apache.org> In-Reply-To: <2a327f3b58ac4334afcece6a27461653@git.apache.org> References: <2a327f3b58ac4334afcece6a27461653@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/33] rexi commit: updated refs/heads/master to bbf59a2 Tag all replies to the coordinator BugzID: 20204 Project: http://git-wip-us.apache.org/repos/asf/couchdb-rexi/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-rexi/commit/c275f924 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-rexi/tree/c275f924 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-rexi/diff/c275f924 Branch: refs/heads/master Commit: c275f924aac24bd113fbf27eefd1b95281491c92 Parents: 4c99447 Author: Adam Kocoloski Authored: Thu Jun 6 15:53:24 2013 -0400 Committer: Robert Newson Committed: Wed Jul 23 17:57:42 2014 +0100 ---------------------------------------------------------------------- src/rexi.erl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-rexi/blob/c275f924/src/rexi.erl ---------------------------------------------------------------------- diff --git a/src/rexi.erl b/src/rexi.erl index c970f80..d37d360 100644 --- a/src/rexi.erl +++ b/src/rexi.erl @@ -95,7 +95,7 @@ async_server_call(Server, Caller, Request) -> -spec reply(any()) -> any(). reply(Reply) -> {Caller, Ref} = get(rexi_from), - erlang:send(Caller, {Ref,Reply}). + erlang:send(Caller, {rexi, Ref, Reply}). %% @equiv sync_reply(Reply, 300000) sync_reply(Reply) -> @@ -108,7 +108,7 @@ sync_reply(Reply) -> sync_reply(Reply, Timeout) -> {Caller, Ref} = get(rexi_from), Tag = make_ref(), - erlang:send(Caller, {Ref, {self(),Tag}, Reply}), + erlang:send(Caller, {rexi, Ref, {self(),Tag}, Reply}), receive {Tag, Response} -> Response after Timeout -> @@ -132,7 +132,7 @@ stream(Msg, Limit, Timeout) -> {ok, Count} -> put(rexi_unacked, Count+1), {Caller, Ref} = get(rexi_from), - erlang:send(Caller, {Ref, self(), Msg}), + erlang:send(Caller, {rexi, Ref, self(), Msg}), ok catch throw:timeout -> timeout