Merge in defaultbug24164

6 files changed, 18 insertions, 11 deletions

diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in
index 6d939c59..65a3269a 100644
--- a/ebin/rabbit_app.in
+++ b/ebin/rabbit_app.in
@@ -21,8 +21,6 @@
          {msg_store_index_module, rabbit_msg_store_ets_index},
          {backing_queue_module, rabbit_variable_queue},
          {frame_max, 131072},
-         {persister_max_wrap_entries, 500},
-         {persister_hibernate_after, 10000},
          {msg_store_file_size_limit, 16777216},
          {queue_index_max_journal_entries, 262144},
          {default_user, <<"guest">>},
@@ -33,6 +31,7 @@
          {cluster_nodes, []},
          {server_properties, []},
          {collect_statistics, none},
+         {collect_statistics_interval, 5000},
          {auth_mechanisms, ['PLAIN', 'AMQPLAIN']},
          {auth_backends, [rabbit_auth_backend_internal]},
          {delegate_count, 16},
diff --git a/include/rabbit.hrl b/include/rabbit.hrl
index ee6e67b6..b65f048d 100644
--- a/include/rabbit.hrl
+++ b/include/rabbit.hrl
@@ -86,7 +86,6 @@
 
 -define(HIBERNATE_AFTER_MIN,        1000).
 -define(DESIRED_HIBERNATE,         10000).
--define(STATS_INTERVAL,             5000).
 
 -define(ROUTING_HEADERS, [<<"CC">>, <<"BCC">>]).
 -define(DELETED_HEADER, <<"BCC">>).
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index f9e9df8b..ffc826eb 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -120,6 +120,9 @@ done
 rm -rf %{buildroot}
 
 %changelog
+* Thu Jun 9 2011 jerryk@vmware.com 2.5.0-1
+- New Upstream Release
+
 * Thu Apr 7 2011 Alexandru Scvortov <alexandru@rabbitmq.com> 2.4.1-1
 - New Upstream Release
 
diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog
index 0383b955..1cab4235 100644
--- a/packaging/debs/Debian/debian/changelog
+++ b/packaging/debs/Debian/debian/changelog
@@ -1,3 +1,9 @@
+rabbitmq-server (2.5.0-1) lucid; urgency=low
+
+  * New Upstream Release
+
+ --  <jerryk@vmware.com>  Thu, 09 Jun 2011 07:20:29 -0700
+
 rabbitmq-server (2.4.1-1) lucid; urgency=low
 
   * New Upstream Release
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 07a24af8..1e5ad349 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -431,9 +431,7 @@ confirm_messages(MsgIds, State = #q{msg_id_to_channel = MTC}) ->
                                     {CMs, MTC0}
                             end
                     end, {gb_trees:empty(), MTC}, MsgIds),
-    gb_trees_foreach(fun(ChPid, MsgSeqNos) ->
-                             rabbit_channel:confirm(ChPid, MsgSeqNos)
-                     end, CMs),
+    gb_trees_foreach(fun rabbit_channel:confirm/2, CMs),
     State#q{msg_id_to_channel = MTC1}.
 
 gb_trees_foreach(_, none) ->
diff --git a/src/rabbit_event.erl b/src/rabbit_event.erl
index 9ed532db..468f9293 100644
--- a/src/rabbit_event.erl
+++ b/src/rabbit_event.erl
@@ -26,7 +26,7 @@
 
 %%----------------------------------------------------------------------------
 
--record(state, {level, timer}).
+-record(state, {level, interval, timer}).
 
 %%----------------------------------------------------------------------------
 
@@ -49,6 +49,7 @@
 
 -opaque(state() :: #state {
                level :: level(),
+               interval :: integer(),
                timer :: atom()
               }).
 
@@ -95,13 +96,14 @@ start_link() ->
 
 init_stats_timer() ->
     {ok, StatsLevel} = application:get_env(rabbit, collect_statistics),
-    #state{level = StatsLevel, timer = undefined}.
+    {ok, Interval} = application:get_env(rabbit, collect_statistics_interval),
+    #state{level = StatsLevel, interval = Interval, timer = undefined}.
 
 ensure_stats_timer(State = #state{level = none}, _Fun) ->
     State;
-ensure_stats_timer(State = #state{timer = undefined}, Fun) ->
-    {ok, TRef} = timer:apply_after(?STATS_INTERVAL,
-                                   erlang, apply, [Fun, []]),
+ensure_stats_timer(State = #state{interval = Interval,
+                                  timer    = undefined}, Fun) ->
+    {ok, TRef} = timer:apply_after(Interval, erlang, apply, [Fun, []]),
     State#state{timer = TRef};
 ensure_stats_timer(State, _Fun) ->
     State.