diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-10-13 12:43:55 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-10-13 12:43:55 +0100 |
| commit | 5af3597a7ed267cbac53c0d5cc6f4effe9ff35c3 (patch) | |
| tree | 27c2dc2527b1b5da278b890120c28937236d95bb /include | |
| parent | c6817c6d08142f9be24cb6a8377e46628b57c392 (diff) | |
| parent | b7c4c9f3a19669f7c7ff281963baf7948681aa33 (diff) | |
| download | rabbitmq-server-git-5af3597a7ed267cbac53c0d5cc6f4effe9ff35c3.tar.gz | |
merge default into bug20284
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit.hrl | 5 | ||||
| -rw-r--r-- | include/rabbit_backing_queue_spec.hrl | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index 73a8ad972a..5770cb9580 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -69,8 +69,9 @@ is_persistent}). -record(ssl_socket, {tcp, ssl}). --record(delivery, {mandatory, immediate, txn, sender, message}). --record(amqp_error, {name, explanation = "", method = none}). +-record(delivery, {mandatory, immediate, txn, sender, message, + origin, msg_seq_no}). +-record(amqp_error, {name, explanation, method = none}). -record(event, {type, props, timestamp}). diff --git a/include/rabbit_backing_queue_spec.hrl b/include/rabbit_backing_queue_spec.hrl index 38c6f9398f..9f3a022797 100644 --- a/include/rabbit_backing_queue_spec.hrl +++ b/include/rabbit_backing_queue_spec.hrl @@ -37,6 +37,7 @@ -type(attempt_recovery() :: boolean()). -type(purged_msg_count() :: non_neg_integer()). -type(ack_required() :: boolean()). +-type(confirm_required() :: boolean()). -spec(start/1 :: ([rabbit_amqqueue:name()]) -> 'ok'). -spec(stop/0 :: () -> 'ok'). @@ -45,12 +46,12 @@ -spec(terminate/1 :: (state()) -> state()). -spec(delete_and_terminate/1 :: (state()) -> state()). -spec(purge/1 :: (state()) -> {purged_msg_count(), state()}). --spec(publish/2 :: (rabbit_types:basic_message(), state()) -> state()). --spec(publish_delivered/3 :: - (ack_required(), rabbit_types:basic_message(), state()) -> - {ack(), state()}). +-spec(publish/3 :: (rabbit_types:basic_message(), + confirm_required(), state()) -> state()). +-spec(publish_delivered/4 :: (ack_required(), rabbit_types:basic_message(), + confirm_required(), state()) -> {ack(), state()}). -spec(fetch/2 :: (ack_required(), state()) -> {fetch_result(), state()}). --spec(ack/2 :: ([ack()], state()) -> state()). +-spec(ack/2 :: ([ack()], state()) -> {[rabbit_guid:guid()], state()}). -spec(tx_publish/3 :: (rabbit_types:txn(), rabbit_types:basic_message(), state()) -> state()). -spec(tx_ack/3 :: (rabbit_types:txn(), [ack()], state()) -> state()). |