summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2015-03-11 16:17:25 +0100
committerJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2015-03-11 16:17:25 +0100
commit17a5da8f085e4d4acb349fc41ceca0e923ac67d3 (patch)
tree6d3b51561ea384f3b51f477b05d91237ebe1f3e7 /include
parente03e7da3115c54e8a7ca54ad3cc2c4c74f7ed417 (diff)
parent578cfc1916a4b6a8202b2f4698e35eb76942f061 (diff)
downloadrabbitmq-server-git-17a5da8f085e4d4acb349fc41ceca0e923ac67d3.tar.gz
Merge branch 'master' into stable
Diffstat (limited to 'include')
-rw-r--r--include/rabbit.hrl15
1 files changed, 10 insertions, 5 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl
index 74e165cd9b..7627ed431e 100644
--- a/include/rabbit.hrl
+++ b/include/rabbit.hrl
@@ -14,12 +14,17 @@
%% Copyright (c) 2007-2014 GoPivotal, Inc. All rights reserved.
%%
+%% Passed around most places
-record(user, {username,
tags,
- auth_backend, %% Module this user came from
- impl %% Scratch space for that module
- }).
+ authz_backends}). %% List of {Module, AuthUserImpl} pairs
+%% Passed to auth backends
+-record(auth_user, {username,
+ tags,
+ impl}).
+
+%% Implementation for the internal auth backend
-record(internal_user, {username, password_hash, tags}).
-record(permission, {configure, write, read}).
-record(user_vhost, {username, virtual_host}).
@@ -52,7 +57,7 @@
arguments, %% immutable
pid, %% durable (just so we know home node)
slave_pids, sync_slave_pids, %% transient
- down_slave_nodes, %% durable
+ recoverable_slaves, %% durable
policy, %% durable, implicit update as above
gm_pids, %% transient
decorators, %% transient, recalculated as above
@@ -83,7 +88,7 @@
is_persistent}).
-record(ssl_socket, {tcp, ssl}).
--record(delivery, {mandatory, confirm, sender, message, msg_seq_no}).
+-record(delivery, {mandatory, confirm, sender, message, msg_seq_no, flow}).
-record(amqp_error, {name, explanation = "", method = none}).
-record(event, {type, props, reference = undefined, timestamp}).