diff options
| author | Diana Corbacho <diana.corbacho@erlang-solutions.com> | 2016-01-27 12:07:52 +0000 |
|---|---|---|
| committer | Diana Corbacho <diana.corbacho@erlang-solutions.com> | 2016-01-27 12:07:52 +0000 |
| commit | 266d94ac2701618ac2040b2a1ec0f706ef0c70fc (patch) | |
| tree | 2a94d3a06da9dd6848f14f4fb3643856f2537d35 /src | |
| parent | 5dfd117a18355ae71b7ec7d389cc8e7a45516aa9 (diff) | |
| download | rabbitmq-server-git-266d94ac2701618ac2040b2a1ec0f706ef0c70fc.tar.gz | |
Introduce timeout in rabbit_channel_sup
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_channel_sup.erl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/rabbit_channel_sup.erl b/src/rabbit_channel_sup.erl index 047fce853f..bad2f3adf0 100644 --- a/src/rabbit_channel_sup.erl +++ b/src/rabbit_channel_sup.erl @@ -53,6 +53,8 @@ -endif. +-define(FAIR_WAIT, 30000). + %%---------------------------------------------------------------------------- start_link({tcp, Sock, Channel, FrameMax, ReaderPid, ConnName, Protocol, User, @@ -69,7 +71,7 @@ start_link({tcp, Sock, Channel, FrameMax, ReaderPid, ConnName, Protocol, User, [Channel, ReaderPid, WriterPid, ReaderPid, ConnName, Protocol, User, VHost, Capabilities, Collector, LimiterPid]}, - intrinsic, ?MAX_WAIT, worker, [rabbit_channel]}), + intrinsic, ?FAIR_WAIT, worker, [rabbit_channel]}), {ok, AState} = rabbit_command_assembler:init(Protocol), {ok, SupPid, {ChannelPid, AState}}; start_link({direct, Channel, ClientChannelPid, ConnPid, ConnName, Protocol, @@ -84,7 +86,7 @@ start_link({direct, Channel, ClientChannelPid, ConnPid, ConnName, Protocol, [Channel, ClientChannelPid, ClientChannelPid, ConnPid, ConnName, Protocol, User, VHost, Capabilities, Collector, LimiterPid]}, - intrinsic, ?MAX_WAIT, worker, [rabbit_channel]}), + intrinsic, ?FAIR_WAIT, worker, [rabbit_channel]}), {ok, SupPid, {ChannelPid, none}}. %%---------------------------------------------------------------------------- @@ -95,8 +97,8 @@ init(Type) -> child_specs({tcp, Sock, Channel, FrameMax, ReaderPid, Protocol, Identity}) -> [{writer, {rabbit_writer, start_link, [Sock, Channel, FrameMax, Protocol, ReaderPid, Identity, true]}, - intrinsic, ?MAX_WAIT, worker, [rabbit_writer]} + intrinsic, ?FAIR_WAIT, worker, [rabbit_writer]} | child_specs({direct, Identity})]; child_specs({direct, Identity}) -> [{limiter, {rabbit_limiter, start_link, [Identity]}, - transient, ?MAX_WAIT, worker, [rabbit_limiter]}]. + transient, ?FAIR_WAIT, worker, [rabbit_limiter]}]. |