Revert "Tag all replies to the coordinator" Not all rexi communication happens through `rexi_utils:recv/6`. We'll need to audit all of our apps to see anywhere that doesn't to update to the new message format.
This reverts commit 2f967906730eedf5851752be06155fc49edd28a1. Project: http://git-wip-us.apache.org/repos/asf/couchdb-rexi/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-rexi/commit/f9380551 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-rexi/tree/f9380551 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-rexi/diff/f9380551 Branch: refs/heads/windsor-merge Commit: f9380551e3bedf4e32842eaca77435206424b1be Parents: 5b58996 Author: Paul J. Davis <[email protected]> Authored: Thu Dec 12 11:36:05 2013 -0600 Committer: Robert Newson <[email protected]> Committed: Wed Jul 23 18:05:43 2014 +0100 ---------------------------------------------------------------------- src/rexi.erl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-rexi/blob/f9380551/src/rexi.erl ---------------------------------------------------------------------- diff --git a/src/rexi.erl b/src/rexi.erl index 62f410b..b0ad8c1 100644 --- a/src/rexi.erl +++ b/src/rexi.erl @@ -98,7 +98,7 @@ async_server_call(Server, Caller, Request) -> -spec reply(any()) -> any(). reply(Reply) -> {Caller, Ref} = get(rexi_from), - erlang:send(Caller, {rexi, Ref, Reply}). + erlang:send(Caller, {Ref,Reply}). %% @equiv sync_reply(Reply, 300000) sync_reply(Reply) -> @@ -111,7 +111,7 @@ sync_reply(Reply) -> sync_reply(Reply, Timeout) -> {Caller, Ref} = get(rexi_from), Tag = make_ref(), - erlang:send(Caller, {rexi, Ref, {self(),Tag}, Reply}), + erlang:send(Caller, {Ref, {self(),Tag}, Reply}), receive {Tag, Response} -> Response after Timeout -> @@ -179,7 +179,7 @@ stream(Msg, Limit, Timeout) -> {ok, Count} -> put(rexi_unacked, Count+1), {Caller, Ref} = get(rexi_from), - erlang:send(Caller, {rexi, Ref, self(), Msg}), + erlang:send(Caller, {Ref, self(), Msg}), ok catch throw:timeout -> exit(timeout)
