diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-10-25 22:29:37 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-10-25 22:29:37 +0100 |
| commit | 740877e7eaf73d4976db445c0b27f39a6c19f1c3 (patch) | |
| tree | 5bd18b9e086a3407b28e032b375046f7e1a61028 /include | |
| parent | d7354c96df639f127b020f8a43f87adad212fe5d (diff) | |
| parent | 6acde84ca164645d554de58cc68f0ef0ab9035ad (diff) | |
| download | rabbitmq-server-git-740877e7eaf73d4976db445c0b27f39a6c19f1c3.tar.gz | |
merge from default again
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit.hrl | 7 | ||||
| -rw-r--r-- | include/rabbit_backing_queue_spec.hrl | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index ae672fc908..df22b5738b 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -69,12 +69,13 @@ 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}). --record(message_properties, {expiry}). +-record(message_properties, {expiry, needs_confirming = false}). %%---------------------------------------------------------------------------- diff --git a/include/rabbit_backing_queue_spec.hrl b/include/rabbit_backing_queue_spec.hrl index 20230b2447..f67c6f46d1 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()). -type(message_properties_transformer() :: fun ((rabbit_types:message_properties()) -> rabbit_types:message_properties())). @@ -57,7 +58,7 @@ (fun ((rabbit_types:message_properties()) -> boolean()), state()) -> 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/4 :: (rabbit_types:txn(), rabbit_types:basic_message(), rabbit_types:message_properties(), state()) -> state()). -spec(tx_ack/3 :: (rabbit_types:txn(), [ack()], state()) -> state()). |