diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2015-09-17 16:37:11 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2015-09-17 16:37:11 +0300 |
| commit | 69fa002aca02ae804eb550cb2ecfa46ba08079c9 (patch) | |
| tree | 8776f4b82beff9bb00adabd1808f8f759f8ac963 /src | |
| parent | 571f1a1722674fcef8705b96051c84eabc1c9ca0 (diff) | |
| parent | e8446a21d053445aaa856e300960656dab9ada66 (diff) | |
| download | rabbitmq-server-git-69fa002aca02ae804eb550cb2ecfa46ba08079c9.tar.gz | |
Merge branch 'master' into rabbitmq-server-270
Diffstat (limited to 'src')
| -rw-r--r-- | src/credit_flow.erl | 7 | ||||
| -rw-r--r-- | src/rabbit_queue_decorator.erl | 16 |
2 files changed, 19 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 diff --git a/src/rabbit_queue_decorator.erl b/src/rabbit_queue_decorator.erl index adfe0c7fae..129f51d099 100644 --- a/src/rabbit_queue_decorator.erl +++ b/src/rabbit_queue_decorator.erl @@ -1,3 +1,19 @@ +%% The contents of this file are subject to the Mozilla Public License +%% Version 1.1 (the "License"); you may not use this file except in +%% compliance with the License. You may obtain a copy of the License +%% at http://www.mozilla.org/MPL/ +%% +%% Software distributed under the License is distributed on an "AS IS" +%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See +%% the License for the specific language governing rights and +%% limitations under the License. +%% +%% The Original Code is RabbitMQ. +%% +%% The Initial Developer of the Original Code is GoPivotal, Inc. +%% Copyright (c) 2007-2015 Pivotal Software, Inc. All rights reserved. +%% + -module(rabbit_queue_decorator). -include("rabbit.hrl"). |