#85 finalized code for setting socket timeout values on the session. Normalized merged code.

Author: bbottema

src/main/java/org/simplejavamail/mailer/Mailer.java

@@ -86,10 +86,10 @@ public class Mailer {
 	private static final Logger LOGGER = LoggerFactory.getLogger(Mailer.class);
 
 	/**
-	 * The default maximum timeout value for the transport socket is {@value #DEFAULT_MAIL_SOCKET_TIMEOUT}
+	 * The default maximum timeout value for the transport socket is {@value #DEFAULT_SESSION_TIMEOUT_MILLIS}
 	 * milliseconds. Can be overridden from a config file or through System variable.
 	 */
-	private static final String DEFAULT_MAIL_SOCKET_TIMEOUT = "60000";
+	private static final int DEFAULT_SESSION_TIMEOUT_MILLIS = 60_000;
 
 	private final MailSender mailSender;
 
@@ -238,12 +238,11 @@ public static Session createMailSession(final ServerConfig serverConfig, final T
 		props.put(transportStrategy.propertyNamePort(), String.valueOf(serverConfig.getPort()));
 
 		// socket timeouts handling
-		String sendMailTimeoutInMillis = ConfigLoader.valueOrProperty(
-			null, Property.DEFAULT_MAIL_SOCKET_TIMEOUT_IN_MILLIS, DEFAULT_MAIL_SOCKET_TIMEOUT
-		);
-		props.put("mail.smtp.connectiontimeout", sendMailTimeoutInMillis);
-		props.put("mail.smtp.timeout", sendMailTimeoutInMillis);
-		props.put("mail.smtp.writetimeout", sendMailTimeoutInMillis);
+		final int sendMailTimeoutInMillis = ConfigLoader.valueOrProperty(null,
+				Property.DEFAULT_SESSION_TIMEOUT_MILLIS, DEFAULT_SESSION_TIMEOUT_MILLIS);
+		props.put("mail.smtp.connectiontimeout", String.valueOf(sendMailTimeoutInMillis));
+		props.put("mail.smtp.timeout", String.valueOf(sendMailTimeoutInMillis));
+		props.put("mail.smtp.writetimeout", String.valueOf(sendMailTimeoutInMillis));
 
 		if (serverConfig.getUsername() != null) {
 			props.put(transportStrategy.propertyNameUsername(), serverConfig.getUsername());

src/main/java/org/simplejavamail/mailer/internal/mailsender/MailSender.java

@@ -158,25 +158,19 @@ the proxy bridge server (or connection pool in async mode) while a non-async ema
         }
         smtpRequestsPhaser.register();
 		if (async) {
-			// start up threadpool pool if necessary
+			// start up thread pool if necessary
 			if (executor == null || executor.isTerminated()) {
 				executor = Executors.newFixedThreadPool(threadPoolSize);
 			}
 			executor.execute(new Runnable() {
-				private static final String NAME = "sendMail process";
-
 				@Override
 				public void run() {
-					try {
-						sendMailClosure(session, email);
-					} catch (Exception e) {
-						LOGGER.error("could not send email {}", email, e);
-					}
+					sendMailClosure(session, email);
 				}
 
 				@Override
 				public String toString() {
-					return NAME;
+					return "sendMail process";
 				}
 			});
 		} else {

src/main/java/org/simplejavamail/springsupport/SimpleJavaMailSpringSupport.java

@@ -15,7 +15,7 @@ public class SimpleJavaMailSpringSupport {
 	@Bean
 	public Mailer loadGlobalConfigAndCreateDefaultMailer(
 			// now obviously there are easier ways to do this, but this is the only way
-			// I can think of that actually works accross Spring versions
+			// I can think of that actually works across Spring versions
 			@Value("${simplejavamail.javaxmail.debug:#{null}}") final String javaxmailDebug,
 			@Value("${simplejavamail.transportstrategy:#{null}}") final String transportstrategy,
 			@Value("${simplejavamail.smtp.host:#{null}}") final String smtpHost,
@@ -39,6 +39,7 @@ public Mailer loadGlobalConfigAndCreateDefaultMailer(
 			@Value("${simplejavamail.defaults.bcc.name:#{null}}") final String defaultBccName,
 			@Value("${simplejavamail.defaults.bcc.address:#{null}}") final String defaultBccAddress,
 			@Value("${simplejavamail.defaults.poolsize:#{null}}") final String defaultPoolsize,
+			@Value("${simplejavamail.defaults.sessiontimeoutmillis:#{null}}") final String defaultSessionTimeoutMillis,
 			@Value("${simplejavamail.transport.mode.logging.only:#{null}}") final String defaultTransportModeLoggingOnly) {
 		final Properties emailProperties = new Properties();
 		setNullableProperty(emailProperties, Property.JAVAXMAIL_DEBUG.key(), javaxmailDebug);
@@ -64,6 +65,7 @@ public Mailer loadGlobalConfigAndCreateDefaultMailer(
 		setNullableProperty(emailProperties, Property.DEFAULT_BCC_NAME.key(), defaultBccName);
 		setNullableProperty(emailProperties, Property.DEFAULT_BCC_ADDRESS.key(), defaultBccAddress);
 		setNullableProperty(emailProperties, Property.DEFAULT_POOL_SIZE.key(), defaultPoolsize);
+		setNullableProperty(emailProperties, Property.DEFAULT_SESSION_TIMEOUT_MILLIS.key(), defaultSessionTimeoutMillis);
 		setNullableProperty(emailProperties, Property.TRANSPORT_MODE_LOGGING_ONLY.key(), defaultTransportModeLoggingOnly);
 
 		ConfigLoader.loadProperties(emailProperties, true);

src/main/java/org/simplejavamail/util/ConfigLoader.java

@@ -46,6 +46,7 @@
  *    <li>simplejavamail.defaults.bcc.name</li>
  *    <li>simplejavamail.defaults.bcc.address</li>
  *    <li>simplejavamail.defaults.poolsize</li>
+ *    <li>simplejavamail.defaults.sessiontimeoutmillis</li>
  *    <li>simplejavamail.transport.mode.logging.only</li>
  * </ul></pre>
  */
@@ -94,7 +95,7 @@ public enum Property {
 		DEFAULT_BCC_NAME("simplejavamail.defaults.bcc.name"),
 		DEFAULT_BCC_ADDRESS("simplejavamail.defaults.bcc.address"),
 		DEFAULT_POOL_SIZE("simplejavamail.defaults.poolsize"),
-		DEFAULT_MAIL_SOCKET_TIMEOUT_IN_MILLIS("simplejavamail.defaults.mailsockettimeoutinmillis"),
+		DEFAULT_SESSION_TIMEOUT_MILLIS("simplejavamail.defaults.sessiontimeoutmillis"),
 		TRANSPORT_MODE_LOGGING_ONLY("simplejavamail.transport.mode.logging.only");
 
 		private final String key;