summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul J. Davis <paul.joseph.davis@gmail.com>2013-12-12 11:36:05 -0600
committerRobert Newson <rnewson@apache.org>2014-07-23 18:05:43 +0100
commitf9380551e3bedf4e32842eaca77435206424b1be (patch)
tree26956ab694f30ec03d89e4e0c828aa3173d82a3a
parent5b5899627db710cab64d1c724cc4ad4d7447b9d8 (diff)
downloadcouchdb-f9380551e3bedf4e32842eaca77435206424b1be.tar.gz
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.
-rw-r--r--src/rexi.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rexi.erl b/src/rexi.erl
index 62f410b8c..b0ad8c152 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)