Skip to content

Commit b3afe4d

Browse files
Notification bug fix
1 parent d476308 commit b3afe4d

File tree

4 files changed

+17
-10
lines changed

4 files changed

+17
-10
lines changed

core/src/main/java/dev/vml/es/acm/core/code/Executor.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,17 @@ private void handleNotifications(ExecutionContext context, ImmediateExecution ex
252252
fields.put("Instance", instanceDesc);
253253

254254
int detailsMaxLength = config.notificationDetailsLength();
255-
String output = StringUtil.markdownCode(execution.getOutput(), "(none)");
256-
String error = StringUtil.markdownCode(execution.getError(), "(none)");
257-
fields.put("Output", detailsMaxLength < 0 ? output : StringUtil.abbreviateStart(output, detailsMaxLength, "[...] "));
258-
fields.put("Error", detailsMaxLength < 0 ? error : StringUtils.abbreviate(error, detailsMaxLength));
255+
String output = StringUtils.trimToNull(execution.getOutput());
256+
String error = StringUtils.trimToNull(execution.getError());
257+
fields.put(
258+
"Output",
259+
StringUtil.markdownCode(
260+
detailsMaxLength < 0 ? output : StringUtil.abbreviateStart(output, detailsMaxLength, "(...)"),
261+
"(none)"));
262+
fields.put(
263+
"Error",
264+
StringUtil.markdownCode(
265+
detailsMaxLength < 0 ? error : StringUtils.abbreviate(error, detailsMaxLength), "(none)"));
259266

260267
notifier.sendMessageTo(config.notificationNotifierId(), title, text, fields);
261268
}

core/src/main/java/dev/vml/es/acm/core/notification/slack/Slack.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import dev.vml.es.acm.core.util.JsonUtils;
55
import java.io.IOException;
66
import java.util.Map;
7-
87
import org.apache.commons.lang3.ArrayUtils;
98
import org.apache.http.HttpHeaders;
109
import org.apache.http.client.config.RequestConfig;
@@ -59,7 +58,8 @@ public boolean isEnabled() {
5958

6059
@Override
6160
public void sendMessage(String title, String text, Map<String, Object> fields) {
62-
SlackPayload payload = SlackPayload.builder().message(title, text, fields).build();
61+
SlackPayload payload =
62+
SlackPayload.builder().message(title, text, fields).build();
6363
sendPayload(payload);
6464
}
6565

core/src/main/java/dev/vml/es/acm/core/notification/teams/Teams.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import dev.vml.es.acm.core.util.JsonUtils;
55
import java.io.IOException;
66
import java.util.Map;
7-
87
import org.apache.commons.lang3.ArrayUtils;
98
import org.apache.http.HttpHeaders;
109
import org.apache.http.client.config.RequestConfig;
@@ -59,7 +58,8 @@ public boolean isEnabled() {
5958

6059
@Override
6160
public void sendMessage(String title, String text, Map<String, Object> fields) {
62-
TeamsPayload payload = TeamsPayload.builder().message(title, text, fields).build();
61+
TeamsPayload payload =
62+
TeamsPayload.builder().message(title, text, fields).build();
6363
sendPayload(payload);
6464
}
6565

core/src/main/java/dev/vml/es/acm/core/util/StringUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ public static String formatDuration(long millis) {
6262
}
6363
}
6464

65-
public static String markdownCode(String code, String defaulString) {
65+
public static String markdownCode(String code, String defaultString) {
6666
if (StringUtils.isBlank(code)) {
67-
return defaulString;
67+
return defaultString;
6868
}
6969
return "```\n" + code.trim() + "\n```";
7070
}

0 commit comments

Comments
 (0)