diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2015-04-29 18:03:17 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2015-04-29 18:03:17 +0300 |
| commit | 35d76e0ecb854ee416f1c5bd4492b5fe31f2eee0 (patch) | |
| tree | 87e7169a0570a24926c6a4e88fc71e59c2eef4cd | |
| parent | 0750291e797336d50d4fd12fa5489a5a51a0cb30 (diff) | |
| download | rabbitmq-server-git-35d76e0ecb854ee416f1c5bd4492b5fe31f2eee0.tar.gz | |
Reduce number of possible values of rabbit.mirroring_flow_control
| -rw-r--r-- | ebin/rabbit_app.in | 2 | ||||
| -rw-r--r-- | src/rabbit_channel.erl | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in index 224829c3bf..654c52bdd3 100644 --- a/ebin/rabbit_app.in +++ b/ebin/rabbit_app.in @@ -81,5 +81,5 @@ gen_fsm, ssl]}, {ssl_apps, [asn1, crypto, public_key, ssl]}, %% see rabbitmq-server#114 - {mirroring_flow_control, flow} + {mirroring_flow_control, true} ]}]}. diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 886c890c88..d0088a5ed8 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -237,10 +237,8 @@ init([Channel, ReaderPid, WriterPid, ConnPid, ConnName, Protocol, User, VHost, process_flag(trap_exit, true), ?store_proc_name({ConnName, Channel}), ok = pg_local:join(rabbit_channels, self()), - Flow = case rabbit_misc:get_env(rabbit, mirroring_control, flow) of - flow -> flow; + Flow = case rabbit_misc:get_env(rabbit, mirroring_flow_control, true) of true -> flow; - noflow -> noflow; false -> noflow end, State = #ch{state = starting, |