Skip to content

GH Issue 1438: Share one SMTP write-timeout executor across sends #8267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
labkey-adam wants to merge 1 commit into from
Closed

GH Issue 1438: Share one SMTP write-timeout executor across sends #8267

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion api/src/org/labkey/api/util/SmtpTransportProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
import java.util.Enumeration;
import java.util.Objects;
import java.util.Properties;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;

/**
* SMTP email transport provider.
Expand All @@ -41,6 +43,7 @@
public class SmtpTransportProvider implements EmailTransportProvider
{
private static final Logger LOG = LogHelper.getLogger(SmtpTransportProvider.class, "SMTP Transport Provider");
private static final ScheduledThreadPoolExecutor WRITE_TIMEOUT_EXECUTOR = createWriteTimeoutExecutor();

private final Properties _properties = new Properties();
private Session _session = null;
Expand Down Expand Up @@ -126,9 +129,22 @@ public void configure(Properties properties)
_session = createSession(_properties);
}

private static ScheduledThreadPoolExecutor createWriteTimeoutExecutor()
{
ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(1, Thread.ofPlatform().daemon().name("SMTP write timeout").factory());
executor.setRemoveOnCancelPolicy(true);
executor.setKeepAliveTime(1, TimeUnit.MINUTES);
executor.allowCoreThreadTimeOut(true);
return executor;
}

private static Session createSession(Properties properties)
{
Session session = Session.getInstance(properties);
// Without a shared executor, Angus Mail creates (and shuts down) a thread pool per connection to enforce writetimeout
Properties sessionProperties = new Properties();
sessionProperties.putAll(properties);
sessionProperties.put("mail.smtp.executor.writetimeout", WRITE_TIMEOUT_EXECUTOR);
Session session = Session.getInstance(sessionProperties);

if ("true".equalsIgnoreCase(session.getProperty("mail.smtp.ssl.enable")) ||
"true".equalsIgnoreCase(session.getProperty("mail.smtp.starttls.enable")))
Expand Down
Loading