Merged bug20917 into default

This commit is contained in:
Ben Hood 2009-07-10 10:07:49 +01:00
commit 7f1959a757
4 changed files with 8 additions and 8 deletions

View File

@ -72,11 +72,11 @@
%% Generic AMQP RPC mechanism that expects a pseudo synchronous response
call(Channel, Method) ->
gen_server:call(Channel, {call, Method}).
gen_server:call(Channel, {call, Method}, infinity).
%% Generic AMQP send mechanism with content
call(Channel, Method, Content) ->
gen_server:call(Channel, {call, Method, Content}).
gen_server:call(Channel, {call, Method, Content}, infinity).
%% Generic AMQP send mechanism that doesn't expect a response
cast(Channel, Method) ->
@ -92,7 +92,7 @@ cast(Channel, Method, Content) ->
%% Registers a consumer pid with the channel
subscribe(Channel, BasicConsume = #'basic.consume'{}, Consumer) ->
gen_server:call(Channel, {BasicConsume, Consumer}).
gen_server:call(Channel, {BasicConsume, Consumer}, infinity).
%%---------------------------------------------------------------------------

View File

@ -92,10 +92,10 @@ open_channel(ConnectionPid) ->
open_channel(ConnectionPid, ChannelNumber, OutOfBand) ->
gen_server:call(ConnectionPid,
{open_channel, ChannelNumber,
amqp_util:binary(OutOfBand)}).
amqp_util:binary(OutOfBand)}, infinity).
%% Closes the AMQP connection
close(ConnectionPid, Close) -> gen_server:call(ConnectionPid, Close).
close(ConnectionPid, Close) -> gen_server:call(ConnectionPid, Close, infinity).
%%---------------------------------------------------------------------------
%% Internal plumbing

View File

@ -45,10 +45,10 @@ start(Connection, Queue) ->
Pid.
stop(Pid) ->
gen_server:call(Pid, stop).
gen_server:call(Pid, stop, infinity).
call(RpcClientPid, Payload) ->
gen_server:call(RpcClientPid, {call, Payload}).
gen_server:call(RpcClientPid, {call, Payload}, infinity).
%---------------------------------------------------------------------------
% Plumbing

View File

@ -46,7 +46,7 @@ start(Connection, Queue, Fun) ->
Pid.
stop(Pid) ->
gen_server:call(Pid, stop).
gen_server:call(Pid, stop, infinity).
%---------------------------------------------------------------------------
% gen_server callbacks