diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2010-12-06 13:04:29 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2010-12-06 13:04:29 +0000 |
| commit | a821bd1fccef580bca7fceaaaeb697e924840c89 (patch) | |
| tree | 8283e83127ac0715c3530098e79bff1e63146e52 /include | |
| parent | 755a485ad914deee022a869f7ed2ae1a268cc11b (diff) | |
| parent | 5ea5799c47e93a0dbf1fcca1e4bf4ebc5e0cc97d (diff) | |
| download | rabbitmq-server-git-a821bd1fccef580bca7fceaaaeb697e924840c89.tar.gz | |
Merge default into bug 23554 (epic debitrot)
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit.hrl | 5 | ||||
| -rw-r--r-- | include/rabbit_backing_queue_spec.hrl | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index 7bea4f5259..9a74503c1c 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(delivery, {mandatory, immediate, txn, sender, message, + 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 fd6d6b8a3f..0f831a7d3d 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/5 :: (rabbit_types:txn(), rabbit_types:basic_message(), rabbit_types:message_properties(), pid(), state()) -> state()). |