Sending a shorter message to email & slack

master
Yan 7 months ago
parent b46cdd8d40
commit 2629d52f2d

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.example</groupId>
<artifactId>guerrilla</artifactId>
<version>1.1.1</version>
<version>1.1.2</version>
<name>guerrilla</name>
<description>Hit and Run</description>
<properties>

@ -53,7 +53,7 @@ public class AppConfig {
public void setVipPages(List<WebPage> vipPages) {
this.vipPages = vipPages;
}
public String toString() {
return ReflectionToStringBuilder.toString(this);
}

@ -9,6 +9,7 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.htmlunit.WebClient;
import org.htmlunit.html.HtmlButton;
@ -92,7 +93,7 @@ public class CaptureService {
@Autowired
private ObjectMapper objectMapper;
@Autowired
private SlackService slackService;
@ -126,15 +127,12 @@ public class CaptureService {
logger.info("entriesDiffering key: {}", entry.getKey());
logger.info("entriesDiffering expected: {}", entry.getValue().leftValue());
logger.info("entriesDiffering actual: {}", entry.getValue().rightValue());
contentBuilder.append(entry.getKey() + "<br/>\n");
contentBuilder.append("EXPECTED: " + entry.getValue().leftValue() + "<br/>\n");
contentBuilder.append("ACTUAL: " + entry.getValue().rightValue() + "<br/>\n");
contentBuilder.append("<br/>\n");
contentBuilder.append(entry.getKey() + "<br/>\n" + entry.getValue().rightValue() + "<br/>\n");
});
Pair<Boolean, Boolean> sendEmailResult = Pair.of(Boolean.TRUE, emailService.sendEmail(fromAddress,
smtpPassword, toAddresses, alertSubject, contentBuilder.toString()));
logger.info("sendEmailResult: {}", sendEmailResult);
if (sendEmailResult.equals(Pair.of(Boolean.TRUE,Boolean.TRUE))) {
if (StringUtils.isNotEmpty(contentBuilder.toString())) {
slackService.sendMessage(contentBuilder.toString());
}
}

@ -35,7 +35,7 @@ public class SlackService {
// Initialize an API Methods client with the given token
MethodsClient methods = slack.methods(token);
String message = new java.util.Date() + "\n\n" + content.replace("<br/>", "\n\n");
String message = new java.util.Date() + "\n" + content.replace("<br/>", "\n");
// Build a request object
ChatPostMessageRequest request = ChatPostMessageRequest.builder().channel(channel).text(message).build();

Loading…
Cancel
Save