diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-08-08 17:15:52 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-08-08 17:15:52 +0100 |
| commit | 14191a156a4be97d87dae99bae3b88d196d9f4e0 (patch) | |
| tree | 20d3c0f73515e2c7aa3028eba46517068876d467 /include/rabbit.hrl | |
| parent | bffc69e2d6adeddf85bbb8e9e161539a73f9ac1d (diff) | |
| parent | 79107abf5327f561ad20f294ac80857a2758e596 (diff) | |
| download | rabbitmq-server-git-14191a156a4be97d87dae99bae3b88d196d9f4e0.tar.gz | |
Merging v2_5 branch to default
Diffstat (limited to 'include/rabbit.hrl')
| -rw-r--r-- | include/rabbit.hrl | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index db4773b8ec..ac6399c64e 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -15,12 +15,12 @@ %% -record(user, {username, - is_admin, + tags, auth_backend, %% Module this user came from impl %% Scratch space for that module }). --record(internal_user, {username, password_hash, is_admin}). +-record(internal_user, {username, password_hash, tags}). -record(permission, {configure, write, read}). -record(user_vhost, {username, virtual_host}). -record(user_permission, {user_vhost, permission}). @@ -42,11 +42,12 @@ -record(resource, {virtual_host, kind, name}). --record(exchange, {name, type, durable, auto_delete, internal, arguments}). +-record(exchange, {name, type, durable, auto_delete, internal, arguments, + scratch}). -record(exchange_serial, {name, next}). -record(amqqueue, {name, durable, auto_delete, exclusive_owner = none, - arguments, pid}). + arguments, pid, slave_pids, mirror_nodes}). %% mnesia doesn't like unary records, so we add a dummy 'value' field -record(route, {binding, value = const}). @@ -67,8 +68,7 @@ is_persistent}). -record(ssl_socket, {tcp, ssl}). --record(delivery, {mandatory, immediate, txn, sender, message, - msg_seq_no}). +-record(delivery, {mandatory, immediate, sender, message, msg_seq_no}). -record(amqp_error, {name, explanation = "", method = none}). -record(event, {type, props, timestamp}). @@ -86,7 +86,6 @@ -define(HIBERNATE_AFTER_MIN, 1000). -define(DESIRED_HIBERNATE, 10000). --define(STATS_INTERVAL, 5000). -define(ROUTING_HEADERS, [<<"CC">>, <<"BCC">>]). -define(DELETED_HEADER, <<"BCC">>). |