diff options
| -rw-r--r-- | src/rabbit_policies.erl | 1 | ||||
| -rw-r--r-- | src/rabbit_policy.erl | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/rabbit_policies.erl b/src/rabbit_policies.erl index 94bbd36418..c30b4ca148 100644 --- a/src/rabbit_policies.erl +++ b/src/rabbit_policies.erl @@ -41,6 +41,7 @@ register() -> {policy_validator, <<"max-length">>}, {policy_validator, <<"max-length-bytes">>}, {policy_validator, <<"queue-mode">>}, + {operator_policy_validator, <<"expires">>}, {operator_policy_validator, <<"message-ttl">>}, {operator_policy_validator, <<"max-length">>}, {operator_policy_validator, <<"max-length-bytes">>}]], diff --git a/src/rabbit_policy.erl b/src/rabbit_policy.erl index 89cbdcf9d4..7cb1231e4d 100644 --- a/src/rabbit_policy.erl +++ b/src/rabbit_policy.erl @@ -134,6 +134,7 @@ merge_policy_value(Name, PolicyVal, OpVal) -> policy_merge_strategy(<<"message-ttl">>) -> fun erlang:min/2; policy_merge_strategy(<<"max-length">>) -> fun erlang:min/2; policy_merge_strategy(<<"max-length-bytes">>) -> fun erlang:min/2; +policy_merge_strategy(<<"expires">>) -> fun erlang:min/2; policy_merge_strategy(_) -> undefined. |