summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Hood <0x6e6562@gmail.com>2009-01-21 13:19:48 +0000
committerBen Hood <0x6e6562@gmail.com>2009-01-21 13:19:48 +0000
commita943bca61ee9f539dd0f662e8cac372ec36752d0 (patch)
tree93a4825b1871717b101132341c9707c3b7b38b77
parent60ddc29695d13c8ad356cdbf18da8718d6e4952f (diff)
parent5dea2bfc4b2d4a57871f773f7676485655d45ec2 (diff)
downloadrabbitmq-server-bug20097.tar.gz
Merged default into 20097, againbug20097
-rw-r--r--src/rabbit_limiter.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_limiter.erl b/src/rabbit_limiter.erl
index 20a66ac5..532be26d 100644
--- a/src/rabbit_limiter.erl
+++ b/src/rabbit_limiter.erl
@@ -76,12 +76,12 @@ shutdown(undefined) ->
ok;
shutdown(LimiterPid) ->
unlink(LimiterPid),
- gen_server:cast(LimiterPid, shutdown).
+ gen_server2:cast(LimiterPid, shutdown).
limit(undefined, 0) ->
ok;
limit(LimiterPid, PrefetchCount) ->
- gen_server:cast(LimiterPid, {limit, PrefetchCount}).
+ gen_server2:cast(LimiterPid, {limit, PrefetchCount}).
%% Ask the limiter whether the queue can deliver a message without
%% breaching a limit
@@ -90,18 +90,18 @@ can_send(undefined, _QPid) ->
can_send(LimiterPid, QPid) ->
rabbit_misc:with_exit_handler(
fun () -> true end,
- fun () -> gen_server:call(LimiterPid, {can_send, QPid}) end).
+ fun () -> gen_server2:call(LimiterPid, {can_send, QPid}) end).
%% Let the limiter know that the channel has received some acks from a
%% consumer
ack(undefined, _Count) -> ok;
-ack(LimiterPid, Count) -> gen_server:cast(LimiterPid, {ack, Count}).
+ack(LimiterPid, Count) -> gen_server2:cast(LimiterPid, {ack, Count}).
register(undefined, _QPid) -> ok;
-register(LimiterPid, QPid) -> gen_server:cast(LimiterPid, {register, QPid}).
+register(LimiterPid, QPid) -> gen_server2:cast(LimiterPid, {register, QPid}).
unregister(undefined, _QPid) -> ok;
-unregister(LimiterPid, QPid) -> gen_server:cast(LimiterPid, {unregister, QPid}).
+unregister(LimiterPid, QPid) -> gen_server2:cast(LimiterPid, {unregister, QPid}).
%%----------------------------------------------------------------------------
%% gen_server callbacks