From 61902beb898b3c84a343706b2c626798f77bb829 Mon Sep 17 00:00:00 2001 From: Eirik Nygaard Date: Sun, 24 Apr 2022 22:11:32 +0200 Subject: Pretty print application id source, with standard serialization --- .../com/yahoo/vespa/hosted/controller/notify/Notifier.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notify/Notifier.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notify/Notifier.java index 7692752f3ca..fcdb905ee3a 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notify/Notifier.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notify/Notifier.java @@ -95,7 +95,7 @@ public class Notifier { private Mail mailOf(Notification n, Collection recipients) { var source = n.source(); - var subject = Text.format("[%s] %s Vespa Notification for %s - %s", n.level().toString().toUpperCase(), n.type().name(), source.tenant(), source.application()); + var subject = Text.format("[%s] %s Vespa Notification for %s", n.level().toString().toUpperCase(), n.type().name(), applicationIdSource(source)); var body = new StringBuilder(); body.append("Source: ").append(n.source().toString()).append("\n") .append("\n") @@ -105,6 +105,14 @@ public class Notifier { return new Mail(recipients, subject.toString(), body.toString()); } + private String applicationIdSource(NotificationSource source) { + StringBuilder sb = new StringBuilder(); + sb.append(source.tenant().value()); + source.application().ifPresent(applicationName -> sb.append(".").append(applicationName.value())); + source.instance().ifPresent(instanceName -> sb.append(".").append(instanceName.value())); + return sb.toString(); + } + private URI url(NotificationSource source) { if (source.application().isPresent() && source.instance().isPresent()) { if (source.jobType().isPresent() && source.runNumber().isPresent()) { -- cgit v1.2.3 From 845e6a21ad199bb49757ff85283b59f4cd3b6024 Mon Sep 17 00:00:00 2001 From: Eirik Nygaard Date: Sun, 24 Apr 2022 22:15:46 +0200 Subject: remove useless toString() call --- .../main/java/com/yahoo/vespa/hosted/controller/notify/Notifier.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notify/Notifier.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notify/Notifier.java index fcdb905ee3a..246249d363f 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notify/Notifier.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notify/Notifier.java @@ -102,7 +102,7 @@ public class Notifier { .append(String.join("\n", n.messages())) .append("\n") .append(url(source).toString()); - return new Mail(recipients, subject.toString(), body.toString()); + return new Mail(recipients, subject, body.toString()); } private String applicationIdSource(NotificationSource source) { -- cgit v1.2.3