diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2015-09-17 16:18:24 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2015-09-17 16:18:24 +0300 |
| commit | e8446a21d053445aaa856e300960656dab9ada66 (patch) | |
| tree | 1257235e3153f7f14dbd2915df76c0e121426577 /src | |
| parent | 76f9565ecc25357d894508f61e1d2864176de527 (diff) | |
| parent | 0c9bf69dc9d96cfe4b100c289e7ef259caa74253 (diff) | |
| download | rabbitmq-server-git-e8446a21d053445aaa856e300960656dab9ada66.tar.gz | |
Merge branch 'stable'
Make credit flow setting a tuple, per discussion with @videlalvaro.
Diffstat (limited to 'src')
| -rw-r--r-- | src/credit_flow.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/credit_flow.erl b/src/credit_flow.erl index d2f2355f03..02fd19620b 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 |