nclazz
/
nclazz-mail-relay
2
0
Fork 0
Code Issues 4 Pull Requests Projects Releases 1 Wiki Activity

Improved Logging 

Added some logging statements into Relay and MailForwarder for better debugging. Closes #11
pull/21/head
Niclas Thobaben 2022-02-15 12:07:44 +01:00
parent f6e792b4e8
commit daea4c04ca
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/de/nclazz/service/mailrelay/adapter/mail/MailMessageForwarder.java
View File

@ -4,6 +4,7 @@ import de.nclazz.service.mailrelay.domain.MessageForwarder;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.scheduling.annotation.Async;
@ -13,6 +14,7 @@ import javax.mail.internet.MimeMessage;
import java.util.List;
@Service
@Slf4j
@RequiredArgsConstructor
public class MailMessageForwarder implements MessageForwarder {
@ -24,7 +26,7 @@ public class MailMessageForwarder implements MessageForwarder {
public void forwardMessage(@NonNull String subject, @NonNull String content,
@NonNull String from, @NonNull List<String> receivers) {
log.info("Send Mail '{}' from {} to {}", subject, from, receivers);
MimeMessage mimeMessage = this.javaMailSender.createMimeMessage();
MimeMessageHelper mimeMessageHelper = new MimeMessageHelper(mimeMessage, false, "UTF-8");

10
src/main/java/de/nclazz/service/mailrelay/domain/Relay.java
View File

@ -31,7 +31,9 @@ public class Relay {
@Transactional
public Message forwardMessage(@NonNull String token, @NonNull Message message) {
log.info("Forward message '{}' to <{}>", message.getSubject(), token);
log.info("Try forwarding message '{}' from {} to {}",
message.getSubject(), message.getFrom(), token);
Optional<Account> accountOptional = this.accountRepository.findByToken(token);
if(accountOptional.isPresent()) {
@ -42,6 +44,9 @@ public class Relay {
}
private Message forwardMessageToAccount(Message message, Account account) {
log.info("Account {} found. Forwarding '{}' from {}",
account.getToken(), message.getSubject(), message.getFrom());
message.setAccount(account);
message.setReceivers(new ArrayList<>(account.getReceivers()));
message = this.messageRepository.save(message);
@ -58,6 +63,7 @@ public class Relay {
}
public Account saveAccount(@NonNull Account account) {
log.info("Save account <{}> {} {}", account.getGuid(), account.getToken(), account.getName());
if(StringUtils.isStringEmpty(account.getToken())) {
String token = generateToken();
account.setToken(token);
@ -78,8 +84,10 @@ public class Relay {
}
public Optional<Account> deleteAccount(@NotNull UUID guid) {
log.info("Delete account <{}>", guid);
Optional<Account> accountOptional = findAccount(guid);
if(accountOptional.isEmpty()) {
log.warn("Account {} not found. No account was deleted", guid);
return Optional.empty();
}
this.accountRepository.deleteByGuid(guid);