Sort out priorities: Only info should be at 9. Conserve memory and messages relating to memory monitoring or file handles or such book keeping are at 8. Messages that are higher-priority but nevertheless amqp messages (eg acks, commit-related-actions, notify-sent etc) are at 7.

3 files changed, 12 insertions, 12 deletions

diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index df4ca40f20..31a0f0c1c2 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -304,7 +304,7 @@ requeue(QPid, MsgIds, ChPid) ->
     gen_server2:cast(QPid, {requeue, MsgIds, ChPid}).
 
 ack(QPid, Txn, MsgIds, ChPid) ->
-    gen_server2:pcast(QPid, 8, {ack, Txn, MsgIds, ChPid}).
+    gen_server2:pcast(QPid, 7, {ack, Txn, MsgIds, ChPid}).
 
 commit_all(QPids, Txn) ->
     safe_pmap_ok(
@@ -349,17 +349,17 @@ basic_cancel(#amqqueue{pid = QPid}, ChPid, ConsumerTag, OkMsg) ->
                           infinity).
 
 notify_sent(QPid, ChPid) ->
-    gen_server2:pcast(QPid, 8, {notify_sent, ChPid}).
+    gen_server2:pcast(QPid, 7, {notify_sent, ChPid}).
 
 unblock(QPid, ChPid) ->
-    gen_server2:pcast(QPid, 8, {unblock, ChPid}).
+    gen_server2:pcast(QPid, 7, {unblock, ChPid}).
 
 tx_commit_msg_store_callback(QPid, Pubs, AckTags, From) ->
-    gen_server2:pcast(QPid, 8,
+    gen_server2:pcast(QPid, 7,
                       {tx_commit_msg_store_callback, Pubs, AckTags, From}).
 
 tx_commit_vq_callback(QPid) ->
-    gen_server2:pcast(QPid, 8, tx_commit_vq_callback).
+    gen_server2:pcast(QPid, 7, tx_commit_vq_callback).
 
 internal_delete(QueueName) ->
     rabbit_misc:execute_mnesia_transaction(
@@ -375,13 +375,13 @@ internal_delete(QueueName) ->
       end).
 
 remeasure_rates(QPid) ->
-    gen_server2:pcast(QPid, 9, remeasure_rates).
+    gen_server2:pcast(QPid, 8, remeasure_rates).
 
 set_queue_duration(QPid, Duration) ->
-    gen_server2:pcast(QPid, 9, {set_queue_duration, Duration}).
+    gen_server2:pcast(QPid, 8, {set_queue_duration, Duration}).
 
 set_maximum_since_use(QPid, Age) ->
-    gen_server2:pcast(QPid, 9, {set_maximum_since_use, Age}).
+    gen_server2:pcast(QPid, 8, {set_maximum_since_use, Age}).
 
 on_node_down(Node) ->
     rabbit_misc:execute_mnesia_transaction(
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 9f1a08ee42..670e0fa78e 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -113,7 +113,7 @@ deliver(Pid, ConsumerTag, AckRequired, Msg) ->
     gen_server2:cast(Pid, {deliver, ConsumerTag, AckRequired, Msg}).
 
 conserve_memory(Pid, Conserve) ->
-    gen_server2:pcast(Pid, 9, {conserve_memory, Conserve}).
+    gen_server2:pcast(Pid, 8, {conserve_memory, Conserve}).
 
 list() ->
     pg_local:get_members(rabbit_channels).
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl
index 81663c00e6..5e1c03110b 100644
--- a/src/rabbit_msg_store.erl
+++ b/src/rabbit_msg_store.erl
@@ -301,13 +301,13 @@ contains(MsgId)     -> gen_server2:call(?SERVER, {contains, MsgId}, infinity).
 remove(MsgIds)      -> gen_server2:cast(?SERVER, {remove, MsgIds}).
 release(MsgIds)     -> gen_server2:cast(?SERVER, {release, MsgIds}).
 sync(MsgIds, K)     -> gen_server2:cast(?SERVER, {sync, MsgIds, K}).
-sync()              -> gen_server2:pcast(?SERVER, 9, sync). %% internal
+sync()              -> gen_server2:pcast(?SERVER, 8, sync). %% internal
 
 gc_done(Reclaimed, Source, Destination) ->
-    gen_server2:pcast(?SERVER, 9, {gc_done, Reclaimed, Source, Destination}).
+    gen_server2:pcast(?SERVER, 8, {gc_done, Reclaimed, Source, Destination}).
 
 set_maximum_since_use(Age) ->
-    gen_server2:pcast(?SERVER, 9, {set_maximum_since_use, Age}).
+    gen_server2:pcast(?SERVER, 8, {set_maximum_since_use, Age}).
 
 client_init() ->
     {IState, IModule, Dir} =