diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-09-30 14:37:21 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-09-30 14:37:21 +0100 |
| commit | e6cfdebe34120a934b284ddba47db7e53c48a4fa (patch) | |
| tree | 706009f82b2fb2de3af3652ae864fffc51137f71 /include | |
| parent | b51b34d83dcd19d2c5ab9c007309db703354d5a6 (diff) | |
| parent | 0271621ac9c395b6514eabbc817e13aeb04ba127 (diff) | |
| download | rabbitmq-server-git-e6cfdebe34120a934b284ddba47db7e53c48a4fa.tar.gz | |
merging in from default
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit.hrl | 21 | ||||
| -rw-r--r-- | include/rabbit_framing_spec.hrl | 2 |
2 files changed, 13 insertions, 10 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index bebaee98f6..330eef80d7 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -70,6 +70,8 @@ -record(ssl_socket, {tcp, ssl}). -record(delivery, {mandatory, immediate, txn, sender, message}). +-record(amqp_error, {name, explanation, method = none}). + %%---------------------------------------------------------------------------- -ifdef(use_specs). @@ -107,15 +109,15 @@ read :: regexp()}). -type(amqqueue() :: #amqqueue{name :: queue_name(), - durable :: bool(), - auto_delete :: bool(), + durable :: boolean(), + auto_delete :: boolean(), arguments :: amqp_table(), pid :: maybe(pid())}). -type(exchange() :: #exchange{name :: exchange_name(), type :: exchange_type(), - durable :: bool(), - auto_delete :: bool(), + durable :: boolean(), + auto_delete :: boolean(), arguments :: amqp_table()}). -type(binding() :: #binding{exchange_name :: exchange_name(), @@ -149,11 +151,11 @@ routing_key :: routing_key(), content :: content(), guid :: guid(), - is_persistent :: bool()}). + is_persistent :: boolean()}). -type(message() :: basic_message()). -type(delivery() :: - #delivery{mandatory :: bool(), - immediate :: bool(), + #delivery{mandatory :: boolean(), + immediate :: boolean(), txn :: maybe(txn()), sender :: pid(), message :: message()}). @@ -164,7 +166,10 @@ port :: non_neg_integer()}). -type(not_found() :: {'error', 'not_found'}). -type(routing_result() :: 'routed' | 'unroutable' | 'not_delivered'). - +-type(amqp_error() :: + #amqp_error{name :: atom(), + explanation :: string(), + method :: atom()}). -endif. %%---------------------------------------------------------------------------- diff --git a/include/rabbit_framing_spec.hrl b/include/rabbit_framing_spec.hrl index f45fa6caf4..a78c230167 100644 --- a/include/rabbit_framing_spec.hrl +++ b/include/rabbit_framing_spec.hrl @@ -50,8 +50,6 @@ %% TODO: make this more precise -type(amqp_method_name() :: atom()). -type(channel_number() :: non_neg_integer()). -%% TODO: make this more precise --type(amqp_error() :: {bool(), non_neg_integer(), binary()}). -type(resource_name() :: binary()). -type(routing_key() :: binary()). -type(username() :: binary()). |