diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2012-09-10 10:04:44 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2012-09-10 10:04:44 +0100 |
| commit | 5b9bdc41a322e1d3c8101c741f5387ae070661ae (patch) | |
| tree | 810bc3eb20ea60afa0c54fdc568c1e1b382bdcc0 | |
| parent | 9d667eb5323ed930ded571cf97f1f8e8992a3358 (diff) | |
| download | rabbitmq-server-git-5b9bdc41a322e1d3c8101c741f5387ae070661ae.tar.gz | |
Backout changeset 25ee0d6a9c30
| -rw-r--r-- | src/rabbit_parameter_validation.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_policy.erl | 13 |
2 files changed, 2 insertions, 13 deletions
diff --git a/src/rabbit_parameter_validation.erl b/src/rabbit_parameter_validation.erl index c40104d7a2..2235340f78 100644 --- a/src/rabbit_parameter_validation.erl +++ b/src/rabbit_parameter_validation.erl @@ -57,8 +57,6 @@ proplist(Name, Constraints, Term) when is_list(Term) -> {[{error, "Key \"~s\" not found in ~s", [Key, Name]} | Results0], Term0}; {false, optional} -> - {Results0, Term0}; - {false, {optional, _Default}} -> {Results0, Term0} end end, {[], Term}, Constraints), diff --git a/src/rabbit_policy.erl b/src/rabbit_policy.erl index c7f4d02127..d130c2ee1c 100644 --- a/src/rabbit_policy.erl +++ b/src/rabbit_policy.erl @@ -81,7 +81,7 @@ notify_clear(VHost, <<"policy">>, _Name) -> %%---------------------------------------------------------------------------- list(VHost) -> - [[{<<"name">>, pget(key, P)} | defaults(pget(value, P))] + [[{<<"name">>, pget(key, P)} | pget(value, P)] || P <- rabbit_runtime_parameters:list(VHost, <<"policy">>)]. update_policies(VHost) -> @@ -141,16 +141,7 @@ sort_pred(A, B) -> %%---------------------------------------------------------------------------- -defaults(Props) -> - Def = [{Key, Def} || {Key, _Fun, {optional, Def}} <- policy_validation()], - lists:foldl(fun ({Key, Default}, Props1) -> - case pget(Key, Props1) of - undefined -> [{Key, Default} | Props1]; - _ -> Props1 - end - end, Props, Def). - policy_validation() -> - [{<<"priority">>, fun rabbit_parameter_validation:number/2, {optional, 0}}, + [{<<"priority">>, fun rabbit_parameter_validation:number/2, mandatory}, {<<"pattern">>, fun rabbit_parameter_validation:regex/2, mandatory}, {<<"policy">>, fun rabbit_parameter_validation:list/2, mandatory}]. |