diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2010-10-06 15:29:53 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2010-10-06 15:29:53 +0100 |
| commit | 33d59cf16e7b83eb783de0a5b64f1509c9d6e588 (patch) | |
| tree | c60f15e265bedb532557be235f994559af67c974 /include | |
| parent | c6f48bac39166c3a35f53a6c89e6717b129abe59 (diff) | |
| download | rabbitmq-server-git-33d59cf16e7b83eb783de0a5b64f1509c9d6e588.tar.gz | |
msg_properties -> message_properties in order to be consistent with message and basic_message (though within vq, we have plenty of msg_-prefixes so don't bother inside the msg_status record in there). Also, tidied up a lot of trailing whitespace
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit.hrl | 2 | ||||
| -rw-r--r-- | include/rabbit_backing_queue_spec.hrl | 29 |
2 files changed, 16 insertions, 15 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index 0f0a0e87fd..f924878d7a 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -74,7 +74,7 @@ -record(event, {type, props, timestamp}). --record(msg_properties, {expiry}). +-record(message_properties, {expiry}). %%---------------------------------------------------------------------------- diff --git a/include/rabbit_backing_queue_spec.hrl b/include/rabbit_backing_queue_spec.hrl index 12d3236348..dcff5b371e 100644 --- a/include/rabbit_backing_queue_spec.hrl +++ b/include/rabbit_backing_queue_spec.hrl @@ -34,13 +34,14 @@ %% Message, IsDelivered, AckTag, Remaining_Len {rabbit_types:basic_message(), boolean(), ack(), non_neg_integer()})). -type(peek_result() :: ('empty'|{rabbit_types:basic_message(), - rabbit_types:msg_properties()})). + rabbit_types:message_properties()})). -type(is_durable() :: boolean()). -type(attempt_recovery() :: boolean()). -type(purged_msg_count() :: non_neg_integer()). -type(ack_required() :: boolean()). --type(msg_properties_transformer() :: - fun ((rabbit_types:msg_properties()) -> rabbit_types:msg_properties())). +-type(message_properties_transformer() :: + fun ((rabbit_types:message_properties()) + -> rabbit_types:message_properties())). -spec(start/1 :: ([rabbit_amqqueue:name()]) -> 'ok'). -spec(stop/0 :: () -> 'ok'). @@ -49,26 +50,26 @@ -spec(terminate/1 :: (state()) -> state()). -spec(delete_and_terminate/1 :: (state()) -> state()). -spec(purge/1 :: (state()) -> {purged_msg_count(), state()}). --spec(publish/3 :: - (rabbit_types:basic_message(), rabbit_types:msg_properties(), state()) - -> state()). +-spec(publish/3 :: (rabbit_types:basic_message(), + rabbit_types:message_properties_properties(), state()) + -> state()). -spec(publish_delivered/4 :: (ack_required(), rabbit_types:basic_message(), - rabbit_types:msg_properties(), state()) - -> {ack(), state()}). + rabbit_types:message_properties(), state()) + -> {ack(), state()}). -spec(dropwhile/2 :: - (fun ((rabbit_types:msg_properties()) -> boolean()), state()) + (fun ((rabbit_types:message_properties()) -> boolean()), state()) -> state()). -spec(fetch/2 :: (ack_required(), state()) -> {fetch_result(), state()}). -spec(ack/2 :: ([ack()], state()) -> state()). --spec(tx_publish/4 :: - (rabbit_types:txn(), rabbit_types:basic_message(), - rabbit_types:msg_properties(), state()) -> state()). +-spec(tx_publish/4 :: (rabbit_types:txn(), rabbit_types:basic_message(), + rabbit_types:message_properties(), state()) -> state()). -spec(tx_ack/3 :: (rabbit_types:txn(), [ack()], state()) -> state()). -spec(tx_rollback/2 :: (rabbit_types:txn(), state()) -> {[ack()], state()}). -spec(tx_commit/4 :: (rabbit_types:txn(), fun (() -> any()), - msg_properties_transformer(), state()) -> {[ack()], state()}). --spec(requeue/3 :: ([ack()], msg_properties_transformer(), state()) -> state()). + message_properties_transformer(), state()) -> {[ack()], state()}). +-spec(requeue/3 :: ([ack()], message_properties_transformer(), state()) + -> state()). -spec(len/1 :: (state()) -> non_neg_integer()). -spec(is_empty/1 :: (state()) -> boolean()). -spec(set_ram_duration_target/2 :: |