Skip to content

Commit 169d62a

Browse files
committed
Add leader-locator to CQs in mgmt
On the queues and policies pages
1 parent 8f352da commit 169d62a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

deps/rabbitmq_management/priv/www/js/global.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ var KNOWN_ARGS = {'alternate-exchange': {'short': 'AE', 'type': 'string'
2424
'x-dead-letter-exchange': {'short': 'DLX', 'type': 'string'},
2525
'x-dead-letter-routing-key': {'short': 'DLK', 'type': 'string'},
2626
'x-queue-master-locator': {'short': 'ML', 'type': 'string'},
27+
'x-queue-leader-locator': {'short': 'LL', 'type': 'string'},
2728
'x-max-priority': {'short': 'Pri', 'type': 'int'},
2829
'x-single-active-consumer': {'short': 'SAC', 'type': 'boolean'}};
2930

@@ -238,7 +239,7 @@ var HELP = {
238239
'Sets the <a target="_blank" href="https://www.rabbitmq.com/maxlength.html#overflow-behaviour">queue overflow behaviour</a>. This determines what happens to messages when the maximum length of a queue is reached. Valid values are <code>drop-head</code>, <code>reject-publish</code> or <code>reject-publish-dlx</code>. The quorum queue type only supports <code>drop-head</code> and <code>reject-publish</code>.',
239240

240241
'queue-master-locator':
241-
'Set the queue into master location mode, determining the rule by which the queue master is located when declared on a cluster of nodes.<br/>(Sets the "<a target="_blank" href="https://www.rabbitmq.com/ha.html">x-queue-master-locator</a>" argument.)',
242+
'Deprecated: please use `queue-leader-locator` instead. <a target="_blank" href="https://www.rabbitmq.com/docs/clustering#replica-placement">Controls which node the queue will be running on.</a>',
242243

243244
'queue-leader-locator':
244245
'Set the rule by which the queue leader is located when declared on a cluster of nodes. Valid values are <code>client-local</code> (default) and <code>balanced</code>.',

deps/rabbitmq_management/priv/www/js/tmpl/policies.ejs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@
114114
<td>Queues [Classic]</td>
115115
<td>
116116
<span class="argument-link" field="definition" key="queue-version" type="number">Version</span> <span class="help" id="queue-version"></span> |
117-
<span class="argument-link" field="definition" key="queue-master-locator" type="string">Master locator</span></br>
117+
<span class="argument-link" field="definition" key="queue-master-locator" type="string">Master locator</span> |
118+
<span class="argument-link" field="definition" key="queue-leader-locator" type="string">Leader locator</span></br>
118119
</td>
119120
</tr>
120121
<tr>

deps/rabbitmq_management/priv/www/js/tmpl/queues.ejs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,9 +340,7 @@
340340
| <span class="argument-link" field="arguments" key="x-stream-filter-size-bytes" type="number">Filter size (per chunk) in bytes</span><span class="help" id="queue-stream-filter-size-bytes"></span>
341341
| <span class="argument-link" field="arguments" key="x-initial-cluster-size" type="number">Initial cluster size</span><span class="help" id="queue-initial-cluster-size"></span>
342342
<% } %>
343-
<% if (queue_type != "classic") { %>
344343
| <span class="argument-link" field="arguments" key="x-queue-leader-locator" type="string">Leader locator</span><span class="help" id="queue-leader-locator"></span>
345-
<% } %>
346344
</td>
347345
</tr>
348346
</table>

0 commit comments

Comments
 (0)