summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ebin/rabbit_app.in2
-rw-r--r--src/rabbit_channel.erl4
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,