diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-09-29 10:32:39 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-09-29 10:32:39 +0100 |
| commit | 1ec0627fab0541144dea4960977601590895afb2 (patch) | |
| tree | 49544479716a15780b1efc145e6f0f7b392458fe /include | |
| parent | f18e91e08b265c952b1d46b9d1b49e8216d3ab47 (diff) | |
| parent | 961b38f9564e8c20e1182d398191d456f2bc8352 (diff) | |
| download | rabbitmq-server-git-1ec0627fab0541144dea4960977601590895afb2.tar.gz | |
pull from default
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit.hrl | 2 | ||||
| -rw-r--r-- | include/rabbit_backing_queue_spec.hrl | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index 24aa8d987c..700523d7f7 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -69,7 +69,7 @@ is_persistent}). -record(ssl_socket, {tcp, ssl}). --record(delivery, {mandatory, immediate, txn, sender, message}). +-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 005994f09f..c01e924688 100644 --- a/include/rabbit_backing_queue_spec.hrl +++ b/include/rabbit_backing_queue_spec.hrl @@ -43,9 +43,10 @@ -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(), boolean(), state()) -> state()). +-spec(publish_delivered/4 :: + (ack_required(), rabbit_types:basic_message(), boolean(), state()) + -> {ack(), state()}). -spec(fetch/2 :: (ack_required(), state()) -> {fetch_result(), state()}). -spec(ack/2 :: ([ack()], state()) -> state()). -spec(tx_publish/3 :: (rabbit_types:txn(), rabbit_types:basic_message(), state()) -> state()). |