summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2009-01-26 11:47:50 +0000
committerMatthias Radestock <matthias@lshift.net>2009-01-26 11:47:50 +0000
commit7f080eeb74d94c8d61ccda594dc7eadf486f56ca (patch)
tree554449232947d3303cfe343a32d0d1555896e31d
parentfd0a5e07acd3d337cb979bfa820c342f2835c648 (diff)
downloadrabbitmq-server-git-7f080eeb74d94c8d61ccda594dc7eadf486f56ca.tar.gz
more efficient locking
-rw-r--r--src/rabbit_access_control.erl6
-rw-r--r--src/rabbit_exchange.erl2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_access_control.erl b/src/rabbit_access_control.erl
index 883425d09f..394eb2b124 100644
--- a/src/rabbit_access_control.erl
+++ b/src/rabbit_access_control.erl
@@ -171,7 +171,7 @@ check_resource_access(Username,
add_user(Username, Password) ->
R = rabbit_misc:execute_mnesia_transaction(
fun () ->
- case mnesia:read({rabbit_user, Username}) of
+ case mnesia:wread({rabbit_user, Username}) of
[] ->
ok = mnesia:write(rabbit_user,
#user{username = Username,
@@ -198,7 +198,7 @@ delete_user(Username) ->
username = Username,
virtual_host = '_'},
permission = '_'},
- read)],
+ write)],
ok
end)),
rabbit_log:info("Deleted user ~p~n", [Username]),
@@ -226,7 +226,7 @@ lookup_user(Username) ->
add_vhost(VHostPath) ->
R = rabbit_misc:execute_mnesia_transaction(
fun () ->
- case mnesia:read({rabbit_vhost, VHostPath}) of
+ case mnesia:wread({rabbit_vhost, VHostPath}) of
[] ->
ok = mnesia:write(rabbit_vhost,
#vhost{virtual_host = VHostPath},
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl
index b04a5b37ec..19efd9fc22 100644
--- a/src/rabbit_exchange.erl
+++ b/src/rabbit_exchange.erl
@@ -309,7 +309,7 @@ delete_bindings_for_exchange(ExchangeName) ->
rabbit_route,
#route{binding = #binding{exchange_name = ExchangeName,
_ = '_'}},
- read)],
+ write)],
ok.
delete_bindings_for_queue(QueueName) ->