summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2012-10-02 23:01:33 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2012-10-02 23:01:33 +0100
commit1acaaffbbb9b8749b180a6f0b10b74cf6c252cba (patch)
tree736f5587c49c492d5d8dc8b065ac21dea538e495
parent533c816c17ab0de9db0f1d84b71980ea489a1f25 (diff)
downloadrabbitmq-server-1acaaffbbb9b8749b180a6f0b10b74cf6c252cba.tar.gz
cosmetic
-rw-r--r--src/rabbit_policy.erl17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/rabbit_policy.erl b/src/rabbit_policy.erl
index 69480c9c..f4c1f42b 100644
--- a/src/rabbit_policy.erl
+++ b/src/rabbit_policy.erl
@@ -98,19 +98,17 @@ update_policies(VHost) ->
ok.
update_exchange(X = #exchange{name = XName, policy = OldPolicy}, Policies) ->
- NewPolicy = match(XName, Policies),
- case NewPolicy of
+ case match(XName, Policies) of
OldPolicy -> no_change;
- _ -> rabbit_exchange:update(
+ NewPolicy -> rabbit_exchange:update(
XName, fun(X1) -> X1#exchange{policy = NewPolicy} end),
{X, X#exchange{policy = NewPolicy}}
end.
update_queue(Q = #amqqueue{name = QName, policy = OldPolicy}, Policies) ->
- NewPolicy = match(QName, Policies),
- case NewPolicy of
+ case match(QName, Policies) of
OldPolicy -> no_change;
- _ -> rabbit_amqqueue:update(
+ NewPolicy -> rabbit_amqqueue:update(
QName, fun(Q1) -> Q1#amqqueue{policy = NewPolicy} end),
{Q, Q#amqqueue{policy = NewPolicy}}
end.
@@ -131,12 +129,11 @@ match(Name, Policies) ->
matches(#resource{name = Name}, Policy) ->
match =:= re:run(Name, pget(<<"pattern">>, Policy), [{capture, none}]).
-sort_pred(A, B) ->
- pget(<<"priority">>, A, 0) >= pget(<<"priority">>, B, 0).
+sort_pred(A, B) -> pget(<<"priority">>, A, 0) >= pget(<<"priority">>, B, 0).
%%----------------------------------------------------------------------------
policy_validation() ->
[{<<"priority">>, fun rabbit_parameter_validation:number/2, optional},
- {<<"pattern">>, fun rabbit_parameter_validation:regex/2, mandatory},
- {<<"policy">>, fun rabbit_parameter_validation:list/2, mandatory}].
+ {<<"pattern">>, fun rabbit_parameter_validation:regex/2, mandatory},
+ {<<"policy">>, fun rabbit_parameter_validation:list/2, mandatory}].