#329: moved error message from error-level logging to a new parent exception wrapping the original exception

Author: bbottema

modules/simple-java-mail/src/main/java/org/simplejavamail/mailer/internal/MailerException.java

@@ -11,9 +11,10 @@ class MailerException extends MailException {
 	static final String ERROR_READING_SMIME_FROM_INPUTSTREAM = "Was unable to read S/MIME data from input stream";
 	static final String ERROR_READING_FROM_FILE = "Error reading from file: %s";
 	static final String INVALID_PROXY_SLL_COMBINATION = "Proxy is not supported for SSL connections (this is a limitation by the underlying JavaMail framework)";
-	static final String GENERIC_ERROR = "Third party error";
-	static final String INVALID_ENCODING = "Encoding not accepted";
 	static final String ERROR_CONNECTING_SMTP_SERVER = "Was unable to connect to SMTP server";
+	static final String GENERIC_ERROR = "Failed to send email [%s], reason: Third party error";
+	static final String INVALID_ENCODING = "Failed to send email [%s], reason: Encoding not accepted";
+	static final String UNKNOWN_ERROR = "Failed to send email [%s], reason: Unknown error";
 
 	MailerException(@SuppressWarnings("SameParameterValue") final String message) {
 		super(message);

modules/simple-java-mail/src/main/java/org/simplejavamail/mailer/internal/SendMailClosure.java

@@ -16,7 +16,9 @@
 import java.io.UnsupportedEncodingException;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static java.lang.String.format;
 import static org.simplejavamail.converter.EmailConverter.mimeMessageToEML;
+import static org.simplejavamail.mailer.internal.MailerException.*;
 
 /**
  * Separate closure that can be executed directly or from a thread.
@@ -67,20 +69,19 @@ public void executeClosure() {
 				TransportRunner.sendMessage(operationalConfig.getClusterKey(), session, message, message.getAllRecipients());
 			}
 		} catch (final UnsupportedEncodingException e) {
-			LOGGER.error("Failed to send email:\n{}", email.getId());
-			LOGGER.trace("{}", email);
-			throw new MailerException(MailerException.INVALID_ENCODING, e);
+			handleException(e, INVALID_ENCODING);
 		} catch (final MessagingException e) {
-			LOGGER.error("Failed to send email:\n{}", email.getId());
-			LOGGER.trace("{}", email);
-			throw new MailerException(MailerException.GENERIC_ERROR, e);
+			handleException(e, GENERIC_ERROR);
 		} catch (final Exception e) {
-			LOGGER.error("Failed to send email:\n{}", email.getId());
-			LOGGER.trace("{}", email);
-			throw e;
+			handleException(e, UNKNOWN_ERROR);
 		}
 	}
 
+	private void handleException(final Exception e, String errorMsg) {
+		LOGGER.trace("Failed to send email {}\n{}", email.getId(), email);
+		throw new MailerException(format(errorMsg, email.getId()), e);
+	}
+
 	private void logEmail(final MimeMessage message) {
 		if (transportModeLoggingOnly) {
 			if (LOGGER.isInfoEnabled()) {