diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-09-03 16:45:19 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-09-03 16:45:19 +0100 |
| commit | 9b0c63db7458de39bdd4198a991c4393b1fce824 (patch) | |
| tree | 4a4bb8aeb1763518518dcc6475d3a1aebc26ae0d | |
| parent | 12658e577a52e8edc9a171606810694218746e87 (diff) | |
| download | rabbitmq-server-git-9b0c63db7458de39bdd4198a991c4393b1fce824.tar.gz | |
Oops
| -rw-r--r-- | src/rabbit_policies.erl | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/rabbit_policies.erl b/src/rabbit_policies.erl index a77e1e7b27..ce763777c7 100644 --- a/src/rabbit_policies.erl +++ b/src/rabbit_policies.erl @@ -34,20 +34,25 @@ register() -> {policy_validator, <<"dead-letter-routing-key">>}]], ok. -validate_policy([{<<"alternate-exchange">>, Value}]) +validate_policy(Terms) -> + lists:foldl(fun ({Key, Value}, ok) -> validate_policy0(Key, Value); + (_, Error) -> Error + end, ok, Terms). + +validate_policy0(<<"alternate-exchange">>, Value) when is_binary(Value) -> ok; -validate_policy([{<<"alternate-exchange">>, Value}]) -> +validate_policy0(<<"alternate-exchange">>, Value) -> {error, "~p is not a valid alternate exchange name", [Value]}; -validate_policy([{<<"dead-letter-exchange">>, Value}]) +validate_policy0(<<"dead-letter-exchange">>, Value) when is_binary(Value) -> ok; -validate_policy([{<<"dead-letter-exchange">>, Value}]) -> +validate_policy0(<<"dead-letter-exchange">>, Value) -> {error, "~p is not a valid dead letter exchange name", [Value]}; -validate_policy([{<<"dead-letter-routing-key">>, Value}]) +validate_policy0(<<"dead-letter-routing-key">>, Value) when is_binary(Value) -> ok; -validate_policy([{<<"dead-letter-routing-key">>, Value}]) -> +validate_policy0(<<"dead-letter-routing-key">>, Value) -> {error, "~p is not a valid dead letter routing key", [Value]}. |