diff options
| author | Jerry Kuch <jerryk@vmware.com> | 2010-12-08 14:57:43 -0800 |
|---|---|---|
| committer | Jerry Kuch <jerryk@vmware.com> | 2010-12-08 14:57:43 -0800 |
| commit | 2c7568a94a1df862a9fc540d1483bbe40b7b09f2 (patch) | |
| tree | 6e9bc37e913f7fd285640e6536ebb276384f0a56 /include | |
| parent | 2ba3f3661defc8a58e83f9156fef933f318a11e8 (diff) | |
| parent | 4e4cdeb8ff99b6a9bd00fed681dbfdf39436bbbf (diff) | |
| download | rabbitmq-server-git-2c7568a94a1df862a9fc540d1483bbe40b7b09f2.tar.gz | |
Merge from default.
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 2b4347dd14..8c8e12a15e 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 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()). |