This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit a214e1f0c10016e70a33e014728339c765efdf5f Author: Alex Heneveld <[email protected]> AuthorDate: Wed Oct 20 10:13:26 2021 +0100 attach feed poll tasks to the feeds so they are visible in the ui --- core/src/main/java/org/apache/brooklyn/core/feed/Poller.java | 1 + .../src/main/java/org/apache/brooklyn/util/core/task/ScheduledTask.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java b/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java index 2d70baa..97b7a6b 100644 --- a/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java +++ b/core/src/main/java/org/apache/brooklyn/core/feed/Poller.java @@ -162,6 +162,7 @@ public class Poller<V> { .displayName("scheduled:" + scheduleName) .period(pollJob.pollPeriod) .cancelOnException(false) + .tag(feed!=null ? BrooklynTaskTags.tagForContextAdjunct(feed) : null) .build(); tasks.add(Entities.submit(entity, t)); if (minPeriod==null || (pollJob.pollPeriod.isShorterThan(minPeriod))) { diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/ScheduledTask.java b/core/src/main/java/org/apache/brooklyn/util/core/task/ScheduledTask.java index b6a7029..3b23ac2 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/ScheduledTask.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/ScheduledTask.java @@ -155,7 +155,7 @@ public class ScheduledTask extends BasicTask<Object> { } public Builder displayName(String val) { this.displayName = val; return this; } - public Builder tag(Object val) { this.tags.add(val); return this; } + public Builder tag(Object val) { if (val!=null) this.tags.add(val); return this; } public Builder tagTransient() { return tag(BrooklynTaskTags.TRANSIENT_TASK_TAG); } public Builder delay(Duration val) { this.delay = val; return this; } public Builder period(Duration val) { this.period = val; return this; }
