diff options
author | Emile Joubert <emile@rabbitmq.com> | 2011-09-29 10:19:44 +0100 |
---|---|---|
committer | Emile Joubert <emile@rabbitmq.com> | 2011-09-29 10:19:44 +0100 |
commit | 2ede3cdfc6055c5963db5eab469f58986b10b179 (patch) | |
tree | e7e3b0dfbc3250ea881e1ef9ae7def0d7c2eea2e | |
parent | fa79e2edcab3f749d3b1ce45234d0f0547cc7eca (diff) | |
download | rabbitmq-server-2ede3cdfc6055c5963db5eab469f58986b10b179.tar.gz |
Move #msg_status{} back to rabbit_variable_queue
-rw-r--r-- | include/rabbit_backing_queue.hrl | 27 | ||||
-rw-r--r-- | src/rabbit_variable_queue.erl | 12 |
2 files changed, 11 insertions, 28 deletions
diff --git a/include/rabbit_backing_queue.hrl b/include/rabbit_backing_queue.hrl deleted file mode 100644 index 5947356d..00000000 --- a/include/rabbit_backing_queue.hrl +++ /dev/null @@ -1,27 +0,0 @@ -%% 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 VMware, Inc. -%% Copyright (c) 2007-2011 VMware, Inc. All rights reserved. -%% - --record(msg_status, - { seq_id, - msg_id, - msg, - is_persistent, - is_delivered, - msg_on_disk, - index_on_disk, - msg_props - }). - diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index d11aa639..0ef0043e 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -264,6 +264,17 @@ -record(rates, { egress, ingress, avg_egress, avg_ingress, timestamp }). +-record(msg_status, + { seq_id, + msg_id, + msg, + is_persistent, + is_delivered, + msg_on_disk, + index_on_disk, + msg_props + }). + -record(delta, { start_seq_id, %% start_seq_id is inclusive count, @@ -283,7 +294,6 @@ -define(TRANSIENT_MSG_STORE, msg_store_transient). -include("rabbit.hrl"). --include("rabbit_backing_queue.hrl"). %%---------------------------------------------------------------------------- |