diff options
| -rw-r--r-- | ebin/rabbit_app.in | 6 | ||||
| -rw-r--r-- | src/credit_flow.erl | 7 | ||||
| -rw-r--r-- | test/src/credit_flow_test.erl | 6 |
3 files changed, 8 insertions, 11 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in index 78700f65b5..50b9b9d71e 100644 --- a/ebin/rabbit_app.in +++ b/ebin/rabbit_app.in @@ -86,7 +86,7 @@ {mirroring_flow_control, true}, %% see rabbitmq-server#227 and related tickets {msg_store_credit_disc_bound, {2000, 500}}, - {msg_store_io_batch_size, 2048} - {credit_flow_initial_credit, 200}, - {credit_flow_more_credit_after, 50} + {msg_store_io_batch_size, 2048}, + %% see rabbitmq-server#143 + {credit_flow_default_credit, {200, 50}} ]}]}. diff --git a/src/credit_flow.erl b/src/credit_flow.erl index 3e6ef75128..1271819c5d 100644 --- a/src/credit_flow.erl +++ b/src/credit_flow.erl @@ -34,10 +34,9 @@ -define(DEFAULT_CREDIT, case get(credit_flow_default_credit) of undefined -> - Val = {rabbit_misc:get_env(rabbit, credit_flow_initial_credit, - ?DEFAULT_INITIAL_CREDIT), - rabbit_misc:get_env(rabbit, credit_flow_more_credit_after, - ?DEFAULT_MORE_CREDIT_AFTER)}, + Val = rabbit_misc:get_env(rabbit, credit_flow_default_credit, + {?DEFAULT_INITIAL_CREDIT, + ?DEFAULT_MORE_CREDIT_AFTER}), put(credit_flow_default_credit, Val), Val; Val -> Val diff --git a/test/src/credit_flow_test.erl b/test/src/credit_flow_test.erl index 8ef73e0bad..148c9024f1 100644 --- a/test/src/credit_flow_test.erl +++ b/test/src/credit_flow_test.erl @@ -22,12 +22,10 @@ test_credit_flow_settings() -> %% default values passed = test_proc(200, 50), - application:set_env(rabbit, credit_flow_initial_credit, 100), - application:set_env(rabbit, credit_flow_more_credit_after, 20), + application:set_env(rabbit, credit_flow_default_credit, {100, 20}), passed = test_proc(100, 20), - application:unset_env(rabbit, credit_flow_initial_credit), - application:unset_env(rabbit, credit_flow_more_credit_after), + application:unset_env(rabbit, credit_flow_default_credit), % back to defaults passed = test_proc(200, 50), passed. |