diff --git a/src/main/java/org/cobbzilla/mail/SimpleEmailMessage.java b/src/main/java/org/cobbzilla/mail/SimpleEmailMessage.java index a918631..ef2f4d1 100644 --- a/src/main/java/org/cobbzilla/mail/SimpleEmailMessage.java +++ b/src/main/java/org/cobbzilla/mail/SimpleEmailMessage.java @@ -34,6 +34,7 @@ public class SimpleEmailMessage { @Getter @Setter private String message; @Getter @Setter private String htmlMessage; @JsonIgnore public boolean getHasHtmlMessage() { return htmlMessage != null && htmlMessage.length() > 0; } + public boolean hasHtmlMessage () { return getHasHtmlMessage(); } @JsonIgnore public String getTextContent () { return getMessage(); } @JsonIgnore public String getHtmlContent () { return getHtmlMessage(); } diff --git a/src/main/java/org/cobbzilla/mail/sender/SmtpMailSender.java b/src/main/java/org/cobbzilla/mail/sender/SmtpMailSender.java index 05943c9..4c3c4e8 100644 --- a/src/main/java/org/cobbzilla/mail/sender/SmtpMailSender.java +++ b/src/main/java/org/cobbzilla/mail/sender/SmtpMailSender.java @@ -25,6 +25,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import static org.apache.commons.lang3.exception.ExceptionUtils.getStackTrace; import static org.cobbzilla.util.daemon.ZillaRuntime.*; import static org.cobbzilla.util.string.StringUtil.removeWhitespace; import static org.cobbzilla.util.system.Sleep.sleep; @@ -170,12 +171,12 @@ public class SmtpMailSender implements MailSender { } catch (EmailException e) { if (tries < MAX_TRIES) { - log.warn("Error sending email (try #"+(tries+1)+", will retry): " + shortError(e)); + log.warn("Error sending email (try #"+(tries+1)+", will retry): " + shortError(e) + (e.getCause() != null ? "\nCaused By: "+shortError(e.getCause())+"\n"+getStackTrace(e.getCause()) : "")); sleep(wait, "waiting to send sending email (try #" + (tries + 1) + ", abandoning)"); wait *= 2; } else { - log.warn("Error sending email (try #"+tries+", abandoning): " + shortError(e)); + log.warn("Error sending email (try #"+tries+", abandoning): " + shortError(e) + (e.getCause() != null ? "\nCaused By: "+shortError(e.getCause())+"\n"+getStackTrace(e.getCause()) : "")); throw e; } }