Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion modules/dumbster/src/org/labkey/dumbster/DumbsterModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import org.labkey.api.module.CodeOnlyModule;
import org.labkey.api.module.ModuleContext;
import org.labkey.api.settings.AppProps;
import org.labkey.api.util.MailHelper;
import org.labkey.api.util.SmtpTransportProvider;
import org.labkey.api.view.BaseWebPartFactory;
import org.labkey.api.view.Portal;
import org.labkey.api.view.ViewContext;
Expand Down Expand Up @@ -65,7 +67,7 @@ public WebPartView<?> getWebPartView(@NotNull ViewContext portalCtx, @NotNull Po
@Override
public void doStartup(ModuleContext moduleContext)
{
if (AppProps.getInstance().isMailRecorderEnabled())
if (MailHelper.getActiveProvider() instanceof SmtpTransportProvider && AppProps.getInstance().isMailRecorderEnabled())
DumbsterManager.get().start();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.labkey.api.util.ContextListener;
import org.labkey.api.util.MailHelper;
import org.labkey.api.util.ShutdownListener;
import org.labkey.api.util.SmtpTransportProvider;
import org.labkey.api.util.StringUtilsLabKey;

import jakarta.mail.MessagingException;
Expand Down Expand Up @@ -60,6 +61,12 @@ public static void setInstance(DumbsterManager instance)

public boolean start()
{
if (!(MailHelper.getActiveProvider() instanceof SmtpTransportProvider))
{
_log.error("Mail recorder cannot be started: active mail provider is not SmtpTransportProvider");
return false;
}

if (_server != null && !_server.isStopped())
{
// We're already running, no need to spin up another, but reset the list of messages
Expand Down