Skip to content

Commit bc8a030

Browse files
Merge pull request #14638 from cloudamqp/local_shovel_mgmt_ui_delete_after
Minor: Fix Mgmt UI local shovel delete-after
2 parents a502568 + 98d1360 commit bc8a030

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

deps/rabbitmq_shovel_management/priv/www/js/shovel.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ dispatcher_add(function(sammy) {
7575
//copy the correct delete-after value
7676
if (this.params['src-delete-after-selector'] == 'never') {
7777
this.params['src-delete-after'] = 'never';
78-
} else if (this.params['src-delete-after-selector'] == 'number') {
78+
} else if (this.params['src-delete-after-selector'] == 'number' ||
79+
this.params['src-delete-after-selector'] == 'local-number') {
7980
num_keys.push('src-delete-after');
8081
}
8182

@@ -159,6 +160,16 @@ HELP['shovel-amqp10-auto-delete'] =
159160
<dd>The shovel will delete itself after the given number of messages have been transferred.</dd>\
160161
</dl>';
161162

163+
HELP['shovel-local-auto-delete'] =
164+
'<dl>\
165+
<dt><code>Never</code></dt>\
166+
<dd>The shovel never deletes itself; it will persist until it is explicitly removed.</dd>\
167+
<dt><code>After initial length transferred</code></dt>\
168+
<dd>The shovel will check the length of the queue when it starts up. It will transfer that many messages, and then delete itself.</dd>\
169+
<dt><code>After num messages</code></dt>\
170+
<dd>The shovel will delete itself after the given number of messages have been transferred.</dd>\
171+
</dl>';
172+
162173
HELP['shovel-remaining-counter'] =
163174
'When not <code>unlimited</code>: number of messages left to transfer before this shovel will be deleted.';
164175

deps/rabbitmq_shovel_management/priv/www/js/tmpl/dynamic-shovels.ejs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,12 +247,17 @@
247247
</label>
248248
</td>
249249
<td>
250-
<select name="local-src-delete-after">
250+
<select name="local-src-delete-after-selector" class="controls-appearance">
251251
<option value="never">Never</option>
252252
<option value="queue-length">After initial length transferred</option>
253-
<option value="number">After num messages</option>
253+
<option value="local-number">After num messages</option>
254254
</select>
255255
</td>
256+
<td>
257+
<div id="local-number-div" style="display: none;">
258+
<input type="text" name="local-src-delete-after"/>
259+
</div>
260+
</td>
256261
</tr>
257262
</table>
258263
</div>

0 commit comments

Comments
 (0)