summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Bakken <lbakken@pivotal.io>2017-10-30 08:13:03 -0700
committerLuke Bakken <lbakken@pivotal.io>2017-10-30 08:13:03 -0700
commitb8878e777ce82e5f1406d7ac0c6beea94d984d52 (patch)
tree4ab5619e23c2fa43769c5762292351943a2ad49a
parentd687bf0be3a23fdb63c1c0b36db967285a112c74 (diff)
downloadrabbitmq-server-git-b8878e777ce82e5f1406d7ac0c6beea94d984d52.tar.gz
Accept strings and atoms for queue_master_locator setting
Fixes #1411
-rw-r--r--src/rabbit_queue_location_validator.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/rabbit_queue_location_validator.erl b/src/rabbit_queue_location_validator.erl
index 2b0f8c7a0f..e70bcd314a 100644
--- a/src/rabbit_queue_location_validator.erl
+++ b/src/rabbit_queue_location_validator.erl
@@ -54,7 +54,6 @@ module(#amqqueue{} = Q) ->
undefined -> no_location_strategy;
Mode -> module(Mode)
end;
-
module(Strategy) when is_binary(Strategy) ->
case rabbit_registry:binary_to_type(Strategy) of
{error, not_found} -> no_location_strategy;
@@ -68,4 +67,6 @@ module(Strategy) when is_binary(Strategy) ->
_ ->
no_location_strategy
end
- end.
+ end;
+module(Strategy) ->
+ module(rabbit_data_coercion:to_binary(Strategy)).