diff options
author | Eirik Nygaard <eirik.nygaard@yahooinc.com> | 2022-04-24 22:11:32 +0200 |
---|---|---|
committer | Eirik Nygaard <eirik.nygaard@yahooinc.com> | 2022-04-24 22:11:32 +0200 |
commit | 61902beb898b3c84a343706b2c626798f77bb829 (patch) | |
tree | 376f1fa05340f56aea2f0639f48521b64ffe79e2 | |
parent | 42dfc8a672fa4e088246fd8d7430a61b724bcbdf (diff) |
Pretty print application id source, with standard serialization
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notify/Notifier.java | 10 |
1 files changed, 9 insertions, 1 deletions
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<String> 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()) { |