Selaa lähdekoodia

log cause if found

tags/2.0.1
Jonathan Cobb 4 vuotta sitten
vanhempi
commit
4acc870a9f
2 muutettua tiedostoa jossa 4 lisäystä ja 2 poistoa
  1. +1
    -0
      src/main/java/org/cobbzilla/mail/SimpleEmailMessage.java
  2. +3
    -2
      src/main/java/org/cobbzilla/mail/sender/SmtpMailSender.java

+ 1
- 0
src/main/java/org/cobbzilla/mail/SimpleEmailMessage.java Näytä tiedosto

@@ -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(); }


+ 3
- 2
src/main/java/org/cobbzilla/mail/sender/SmtpMailSender.java Näytä tiedosto

@@ -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;
}
}


Ladataan…
Peruuta
Tallenna