summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2008-07-12 10:00:15 +0100
committerMatthias Radestock <matthias@lshift.net>2008-07-12 10:00:15 +0100
commit37b37bec445c3af76c8ea9815ffe152e8d4bb6df (patch)
treece3da4282525de1ab7fab5ec7fa1f11823caa77a
parentc3a84592c8547eb306fca94c363c308e49d0c98d (diff)
downloadrabbitmq-server-37b37bec445c3af76c8ea9815ffe152e8d4bb6df.tar.gz
cosmetic changes
-rw-r--r--include/rabbit.hrl2
-rw-r--r--src/rabbit_realm.erl25
2 files changed, 14 insertions, 13 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl
index 5a3006dd..21900294 100644
--- a/include/rabbit.hrl
+++ b/include/rabbit.hrl
@@ -29,7 +29,7 @@
-record(vhost, {virtual_host, dummy}).
-record(vhost_realm, {virtual_host, realm}).
--record(realm, {name,ignore}).
+-record(realm, {name, ignore}).
-record(realm_resource, {realm, resource}).
-record(user_realm, {username, realm, ticket_pattern}).
diff --git a/src/rabbit_realm.erl b/src/rabbit_realm.erl
index 2ededb5f..dad3deef 100644
--- a/src/rabbit_realm.erl
+++ b/src/rabbit_realm.erl
@@ -128,9 +128,9 @@ manage_link(Action, Realm = #resource{kind = realm, name = RealmName},
end).
realm_table_for_resource(#resource{kind = exchange}) -> realm_exchange;
-realm_table_for_resource(#resource{kind = queue}) -> realm_queue.
+realm_table_for_resource(#resource{kind = queue}) -> realm_queue.
parent_table_for_resource(#resource{kind = exchange}) -> exchange;
-parent_table_for_resource(#resource{kind = queue}) -> amqqueue.
+parent_table_for_resource(#resource{kind = queue}) -> amqqueue.
check(#resource{kind = realm, name = Realm}, Resource = #resource{}) ->
@@ -143,7 +143,7 @@ check(#resource{kind = realm, name = Realm}, Resource = #resource{}) ->
% Requires a mnesia transaction.
delete_from_all(Resource = #resource{name = Name}) ->
- mnesia:delete_object({realm_table_for_resource(Resource),'_',Name}).
+ mnesia:delete_object({realm_table_for_resource(Resource), '_', Name}).
access_request(Username, Exclusive, Ticket = #ticket{realm_name = RealmName})
when is_binary(Username) ->
@@ -234,21 +234,22 @@ preen_realms() ->
ok.
preen_realm(Resource = #resource{}) ->
LinkType = realm_table_for_resource(Resource),
- Q = qlc:q([L#realm_resource.resource || L <- mnesia:table(LinkType)]),
- Cursor = qlc:cursor(Q),
- preen_next(Cursor,LinkType,parent_table_for_resource(Resource)),
+ Cursor = qlc:cursor(
+ qlc:q([L#realm_resource.resource ||
+ L <- mnesia:table(LinkType)])),
+ preen_next(Cursor, LinkType, parent_table_for_resource(Resource)),
qlc:delete_cursor(Cursor).
-preen_next(Cursor,LinkType,ParentTable) ->
- case qlc:next_answers(Cursor,1) of
+preen_next(Cursor, LinkType, ParentTable) ->
+ case qlc:next_answers(Cursor, 1) of
[] -> ok;
- [ResourceKey] ->
- case mnesia:read({ParentTable,ResourceKey}) of
+ [ResourceName] ->
+ case mnesia:read({ParentTable, ResourceName}) of
[] ->
- mnesia:delete_object({LinkType,'_',ResourceKey});
+ mnesia:delete_object({LinkType, '_', ResourceName});
_ -> ok
end,
- preen_next(Cursor,LinkType,ParentTable)
+ preen_next(Cursor, LinkType, ParentTable)
end.
check_and_lookup(RealmName = #resource{kind = realm,