Merge pull request #390 from rabbitmq/rabbitmq-server-369

Rename policy parameters, references #369

2 files changed, 7 insertions, 7 deletions

diff --git a/src/rabbit_queue_location_validator.erl b/src/rabbit_queue_location_validator.erl
index 4eab52855a..1260423d59 100644
--- a/src/rabbit_queue_location_validator.erl
+++ b/src/rabbit_queue_location_validator.erl
@@ -25,20 +25,20 @@
                    [{description, "Queue location policy validation"},
                     {mfa, {rabbit_registry, register,
                            [policy_validator,
-                            <<"x-queue-master-locator">>,
+                            <<"queue-master-locator">>,
                             ?MODULE]}}]}).
 
 validate_policy(KeyList) ->
-    case proplists:lookup(<<"x-queue-master-locator">> , KeyList) of
+    case proplists:lookup(<<"queue-master-locator">> , KeyList) of
         {_, Strategy} -> validate_strategy(Strategy);
-        _             -> {error, "x-queue-master-locator undefined"}
+        _             -> {error, "queue-master-locator undefined"}
     end.
 
 validate_strategy(Strategy) ->
     case module(Strategy) of
         R={ok, _M} -> R;
         _          ->
-            {error, "~p invalid x-queue-master-locator value", [Strategy]}
+            {error, "~p invalid queue-master-locator value", [Strategy]}
     end.
 
 policy(Policy, Q) ->
@@ -48,7 +48,7 @@ policy(Policy, Q) ->
     end.
 
 module(#amqqueue{} = Q) ->
-    case policy(<<"x-queue-master-locator">>, Q) of
+    case policy(<<"queue-master-locator">>, Q) of
         undefined -> no_location_strategy;
         Mode      -> module(Mode)
     end;
diff --git a/src/rabbit_queue_master_location_misc.erl b/src/rabbit_queue_master_location_misc.erl
index 279869d054..0b5080956c 100644
--- a/src/rabbit_queue_master_location_misc.erl
+++ b/src/rabbit_queue_master_location_misc.erl
@@ -73,8 +73,8 @@ get_location_mod_by_args(#amqqueue{arguments=Args}) ->
     end.
 
 get_location_mod_by_policy(Queue=#amqqueue{}) ->
-    case rabbit_policy:get(<<"x-queue-master-locator">> , Queue) of
-        undefined ->  {error, "x-queue-master-locator policy undefined"};
+    case rabbit_policy:get(<<"queue-master-locator">> , Queue) of
+        undefined ->  {error, "queue-master-locator policy undefined"};
         Strategy  ->
             case rabbit_queue_location_validator:validate_strategy(Strategy) of
                 Reply={ok, _CB} -> Reply;