8000 Merge pull request #662 from rabbitmq/poison-handling-qq · rabbitmq/rabbitmq-management@378ee31 · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Nov 17, 2020. It is now read-only.

Commit 378ee31

Browse files
michaelklishinmichaelklishin
authored
Merge pull request #662 from rabbitmq/poison-handling-qq
Add delivery limit argument
2 parents 2ad82be + d8bc763 commit 378ee31

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

‎priv/www/js/global.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ var KNOWN_ARGS = {'alternate-exchange': {'short': 'AE', 'type': 'string'
1919
'x-expires': {'short': 'Exp', 'type': 'int'},
2020
'x-max-length': {'short': 'Lim', 'type': 'int'},
2121
'x-max-length-bytes': {'short': 'Lim B', 'type': 'int'},
22+
'x-delivery-limit': {'short': 'DlL', 'type': 'int'},
2223
'x-overflow': {'short': 'Ovfl', 'type': 'string'},
2324
'x-dead-letter-exchange': {'short': 'DLX', 'type': 'string'},
2425
'x-dead-letter-routing-key': {'short': 'DLK', 'type': 'string'},
@@ -137,6 +138,9 @@ var COLUMNS =
137138

138139
// All help ? popups
139140
var HELP = {
141+
'delivery-limit':
142+
'The number of allowed unsuccessful delivery attempts. Once a message has been delivered unsucessfully this many times it will be dropped or dead-lettered, depending on the queue configuration.',
143+
140144
'exchange-auto-delete':
141145
'If yes, the exchange will delete itself after at least one queue or exchange has been bound to this one, and then all queues or exchanges have been unbound.',
142146

‎priv/www/js/tmpl/policies.ejs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@
109109
<td>Federation</td>
110110
<td>
111111
<span class="argument-link" field="definition" key="federation-upstream-set" type="string">Federation upstream set</span> <span class="help" id="policy-federation-upstream-set"></span> |
112-
<span class="argument-link" field="definition" key="federation-upstream" type="string">Federation upstream</span> <span class="help" id="policy-federation-upstream"></span>
112+
<span class="argument-link" field="definition" key="federation-upstream" type="string">Federation upstream</span>
113+
<span class="help" id="policy-federation-upstream"></span>
113114
</td>
114115
</tr>
115116
<tr>
@@ -123,7 +124,9 @@
123124
<span class="argument-link" field="definition" key="dead-letter-exchange" type="string">Dead letter exchange</span> |
124125
<span class="argument-link" field="definition" key="dead-letter-routing-key" type="string">Dead letter routing key</span><br />
125126
<span class="argument-link" field="definition" key="queue-mode" type="string" value="lazy">Lazy mode</span> |
126-
<span class="argument-link" field="definition" key="queue-master-locator" type="string">Master Locator</span>
127+
<span class="argument-link" field="definition" key< 8000 span class="pl-k">="queue-master-locator" type="string">Master Locator</span></br>
128+
<span class="argument-link" field="definition" key="delivery-limit" type="number">Delivery limit</span>
129+
<span class="help" id="delivery-limit"></span>
127130
</td>
128131
</tr>
129132
<tr>
@@ -251,6 +254,8 @@
251254
<span class="argument-link" field="definitionop" key="max-length" type="number">Max length</span> |
252255
<span class="argument-link" field="definitionop" key="max-length-bytes" type="number">Max length bytes</span> |
253256
<span class="argument-link" field="definitionop" key="overflow" type="string">Overflow behaviour</span><br/>
257+
<span class="argument-link" field="definitionop" key="delivery-limit" type="string">Delivery limit</span>
258+
<span class="help" id="delivery-limit"></span>
254259
</td>
255260
</tr>
256261
</table>

‎priv/www/js/tmpl/queues.ejs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,15 +276,17 @@
276276
<% } %>
277277
<span class="argument-link" field="arguments" key="x-max-length" type="number">Max length</span> <span class="help" id="queue-max-length"></span> |
278278
<span class="argument-link" field="arguments" key="x-max-length-bytes" type="number">Max length bytes</span> <span class="help" id="queue-max-length-bytes"></span> |
279+
<% if (queue_type == "quorum") { %>
280+
<span class="argument-link" field="arguments" key="x-delivery-limit" type="number">Delivery limit</span><span class="help" id="delivery-limit"></span><br/>
281+
<% } %>
279282
<% if (queue_type == "classic") { %>
280283
<span class="argument-link" field="arguments" key="x-overflow" type="string">Overflow behaviour</span> <span class="help" id="queue-overflow"></span><br/>
281284
<% } %>
282285
<span class="argument-link" field="arguments" key="x-dead-letter-exchange" type="string">Dead letter exchange</span> <span class="help" id="queue-dead-letter-exchange"></span> |
283286
<span class="argument-link" field="arguments" key="x-dead-letter-routing-key" type="string">Dead letter routing key</span> <span class="help" id="queue-dead-letter-routing-key"></span> |
284287
<span class="argument-link" field="arguments" key="x-single-active-consumer" type="boolean">Single active consumer</span> <span class="help" id="queue-single-active-consumer"></span>
285288
<% if (queue_type == "classic") { %>
286-
| <span class="argument-link" field="arguments" key="x-max-priority" type="number">Maximum priority</span> <span class="help" id="queue-max-priority"></span>
287-
<br/>
289+
| <span class="argument-link" field="arguments" key="x-max-priority" type="number">Maximum priority</span> <span class="help" id="queue-max-priority"></span> <br/>
288290
<span class="argument-link" field="arguments" key="x-queue-mode" type="string" value="lazy">Lazy mode</span> <span class="help" id="queue-lazy"></span>
289291
<span class="argument-link" field="arguments" key="x-queue-master-locator" type="string" value="">Master locator</span> <span class="help" id="queue-master-locator"></span>
290292
<% } %>

0 commit comments

Comments
 (0)
0