diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2012-09-10 10:29:09 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2012-09-10 10:29:09 +0100 |
| commit | d4b6f7f3ca063ea4192a6cbb3ae5e107f9ad9d8a (patch) | |
| tree | ce1ce2855a4bd409f5cf9b1013d5d226f2306a3d | |
| parent | 5b9bdc41a322e1d3c8101c741f5387ae070661ae (diff) | |
| download | rabbitmq-server-git-d4b6f7f3ca063ea4192a6cbb3ae5e107f9ad9d8a.tar.gz | |
Reduce over-engineering of default policy priority
| -rw-r--r-- | src/rabbit_policy.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_policy.erl b/src/rabbit_policy.erl index d130c2ee1c..4eb7c2ba0b 100644 --- a/src/rabbit_policy.erl +++ b/src/rabbit_policy.erl @@ -22,7 +22,7 @@ -include("rabbit.hrl"). --import(rabbit_misc, [pget/2]). +-import(rabbit_misc, [pget/2, pget/3]). -export([register/0]). -export([name/1, get/2, set/1]). @@ -137,11 +137,11 @@ matches(#resource{name = Name}, Policy) -> end. sort_pred(A, B) -> - pget(<<"priority">>, A) >= pget(<<"priority">>, B). + pget(<<"priority">>, A, 0) >= pget(<<"priority">>, B, 0). %%---------------------------------------------------------------------------- policy_validation() -> - [{<<"priority">>, fun rabbit_parameter_validation:number/2, mandatory}, + [{<<"priority">>, fun rabbit_parameter_validation:number/2, optional}, {<<"pattern">>, fun rabbit_parameter_validation:regex/2, mandatory}, {<<"policy">>, fun rabbit_parameter_validation:list/2, mandatory}]. |