diff options
| author | ash <ash@lshift.net> | 2015-09-25 12:52:51 +0100 |
|---|---|---|
| committer | ash <ash@lshift.net> | 2015-09-25 12:53:11 +0100 |
| commit | ce514ace295baa88270a0dbfc075f106e966e2f8 (patch) | |
| tree | a3dbae819c35ded08ca134a1af9814a39ead7669 | |
| parent | e35e05833ad9a36f7461e94f59666b16083cc984 (diff) | |
| download | rabbitmq-server-git-ce514ace295baa88270a0dbfc075f106e966e2f8.tar.gz | |
allow initial frame_max to be configured
| -rw-r--r-- | docs/rabbitmq.config.example | 5 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/docs/rabbitmq.config.example b/docs/rabbitmq.config.example index dc0fd5d4a5..3047f8f70e 100644 --- a/docs/rabbitmq.config.example +++ b/docs/rabbitmq.config.example @@ -161,6 +161,11 @@ %% %% {frame_max, 131072}, + %% Set the max frame size the server will accept before connection + %% tuning occurs + %% + %% {initial_frame_max, 4096}, + %% Set the max permissible number of channels per connection. %% 0 means "no limit". %% diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index c1cfb10c67..d2b2bb812d 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -336,6 +336,7 @@ start_connection(Parent, HelperSup, Deb, Sock, SockTransform) -> exit(normal) end, {ok, HandshakeTimeout} = application:get_env(rabbit, handshake_timeout), + InitialFrameMax = application:get_env(rabbit, initial_frame_max, ?FRAME_MIN_SIZE), ClientSock = socket_op(Sock, SockTransform), erlang:send_after(HandshakeTimeout, self(), handshake_timeout), {PeerHost, PeerPort, Host, Port} = @@ -352,7 +353,7 @@ start_connection(Parent, HelperSup, Deb, Sock, SockTransform) -> protocol = none, user = none, timeout_sec = (HandshakeTimeout / 1000), - frame_max = ?FRAME_MIN_SIZE, + frame_max = InitialFrameMax, vhost = none, client_properties = none, capabilities = [], |