summaryrefslogtreecommitdiff
path: root/src/rabbit_msg_store.erl
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2012-01-17 16:52:19 +0000
committerSimon MacMullen <simon@rabbitmq.com>2012-01-17 16:52:19 +0000
commitb74f69d1472551b78c345982cdce6cb53a7c559e (patch)
tree4a68b095e93ecdec466135cea3bd55f2eca589d5 /src/rabbit_msg_store.erl
parent0dca9922eec9bdb12a801c8523d5d513476920a0 (diff)
downloadrabbitmq-server-b74f69d1472551b78c345982cdce6cb53a7c559e.tar.gz
Don't pass the client pid in for write.
Diffstat (limited to 'src/rabbit_msg_store.erl')
-rw-r--r--src/rabbit_msg_store.erl8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl
index a609c8a8..56997010 100644
--- a/src/rabbit_msg_store.erl
+++ b/src/rabbit_msg_store.erl
@@ -468,7 +468,7 @@ write(MsgId, Msg,
ok = client_update_flying(+1, MsgId, CState),
ok = update_msg_cache(CurFileCacheEts, MsgId, Msg),
credit_flow:send(whereis(Server)),
- ok = server_cast(CState, {write, CRef, self(), MsgId}).
+ ok = server_cast(CState, {write, CRef, MsgId}).
read(MsgId,
CState = #client_msstate { cur_file_cache_ets = CurFileCacheEts }) ->
@@ -798,8 +798,10 @@ handle_cast({client_delete, CRef},
State1 = State #msstate { clients = dict:erase(CRef, Clients) },
noreply(remove_message(CRef, CRef, clear_client(CRef, State1)));
-handle_cast({write, CRef, CPid, MsgId},
- State = #msstate { cur_file_cache_ets = CurFileCacheEts }) ->
+handle_cast({write, CRef, MsgId},
+ State = #msstate { cur_file_cache_ets = CurFileCacheEts,
+ clients = Clients }) ->
+ {_, _, CPid} = dict:fetch(CRef, Clients),
credit_flow:ack(CPid),
true = 0 =< ets:update_counter(CurFileCacheEts, MsgId, {3, -1}),
case update_flying(-1, MsgId, CRef, State) of