summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniil Fedotov <dfedotov@pivotal.io>2017-04-05 17:23:43 +0100
committerDaniil Fedotov <dfedotov@pivotal.io>2017-04-05 17:23:43 +0100
commit432f46df0f19322318b686446181f3d44d3998d6 (patch)
tree5105b06b91fa90c9a825113a3f107b6ba8f7c601 /src
parentfe56987d5b8ccf6b8ad073f240c9bf8a330e532d (diff)
downloadrabbitmq-server-git-432f46df0f19322318b686446181f3d44d3998d6.tar.gz
Make queue master locator treat queue args as AMQP table.
Fixes #1172 Tests were using incorrect format for queue args as well as the code.
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_queue_master_location_misc.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_queue_master_location_misc.erl b/src/rabbit_queue_master_location_misc.erl
index 2cc6d515f4..0b9efdd6fc 100644
--- a/src/rabbit_queue_master_location_misc.erl
+++ b/src/rabbit_queue_master_location_misc.erl
@@ -63,8 +63,8 @@ get_location(Queue=#amqqueue{})->
end.
get_location_mod_by_args(#amqqueue{arguments=Args}) ->
- case proplists:lookup(<<"x-queue-master-locator">> , Args) of
- {<<"x-queue-master-locator">> , Strategy} ->
+ case rabbit_misc:table_lookup(Args, <<"x-queue-master-locator">>) of
+ {_Type, Strategy} ->
case rabbit_queue_location_validator:validate_strategy(Strategy) of
Reply = {ok, _CB} -> Reply;
Error -> Error