This commit is contained in:
Michael Klishin 2013-08-01 11:03:16 +04:00
parent 1e646caae1
commit 97f9ea8a34
3 changed files with 13 additions and 13 deletions

View File

@ -32,4 +32,4 @@
{<<"exchange_exchange_bindings">>, bool, true},
{<<"basic.nack">>, bool, true},
{<<"consumer_cancel_notify">>, bool, true},
{<<"connection.blocked">>, bool, true}]).
{<<"connection.blocked">>, bool, true}]).

View File

@ -24,7 +24,7 @@
-export([start_link/5, connect/1, open_channel/3, hard_error_in_channel/3,
channel_internal_error/3, server_misbehaved/2, channels_terminated/1,
close/3, server_close/2, info/2, info_keys/0, info_keys/1,
register_blocked_handler/2]).
register_blocked_handler/2]).
-export([behaviour_info/1]).
-export([init/1, terminate/2, code_change/3, handle_call/3, handle_cast/2,
handle_info/2]).
@ -41,8 +41,8 @@
server_properties,
start_infrastructure_fun,
start_channels_manager_fun,
%% connection.block, connection.unblock handler
block_handler,
%% connection.block, connection.unblock handler
block_handler,
closing = false %% #closing{} | false
}).
@ -168,7 +168,7 @@ init([Mod, Sup, AmqpParams, SIF, SChMF, ExtraParams]) ->
amqp_params = AmqpParams,
start_infrastructure_fun = SIF,
start_channels_manager_fun = SChMF,
block_handler = none}}.
block_handler = none}}.
handle_call(connect, _From,
State0 = #state{module = Mod,

View File

@ -1015,19 +1015,19 @@ connection_blocked_network_test() ->
amqp_connection:register_blocked_handler(Connection, Child),
set_resource_alarm(memory),
Publish = #'basic.publish'{exchange = X,
routing_key = K},
routing_key = K},
amqp_channel:call(Channel, Publish,
#amqp_msg{payload = Payload}),
#amqp_msg{payload = Payload}),
timer:sleep(1000),
receive
ok ->
clear_resource_alarm(memory),
clear_resource_alarm(disk),
ok
clear_resource_alarm(memory),
clear_resource_alarm(disk),
ok
after 10000 ->
?LOG_DEBUG("Are you sure that you have waited 1 minute?~n"),
clear_resource_alarm(memory),
clear_resource_alarm(disk),
?LOG_DEBUG("Did not receive connection.unblocked in 10 seconds~n"),
clear_resource_alarm(memory),
clear_resource_alarm(disk),
exit(did_not_receive_connection_blocked)
end.