Skip to content
Merged
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
7 changes: 7 additions & 0 deletions api/src/org/labkey/api/ApiModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
import org.labkey.api.attachments.AttachmentService;
import org.labkey.api.attachments.ImageServlet;
import org.labkey.api.attachments.LookAndFeelResourceType;
import org.labkey.api.audit.AuditLogService;
import org.labkey.api.audit.provider.SystemUpgradeAuditProvider;
import org.labkey.api.audit.query.AbstractAuditDomainKind;
import org.labkey.api.cache.BlockingCache;
import org.labkey.api.collections.ArrayListMap;
Expand Down Expand Up @@ -184,6 +186,7 @@
import org.labkey.api.util.SystemMaintenanceStartupListener;
import org.labkey.api.util.URIUtil;
import org.labkey.api.util.URLHelper;
import org.labkey.api.util.VersionNumber;
import org.labkey.api.util.XmlBeansUtil;
import org.labkey.api.util.emailTemplate.EmailTemplate;
import org.labkey.api.view.ActionURL;
Expand Down Expand Up @@ -298,9 +301,11 @@ protected void doStartup(ModuleContext moduleContext)
ContentSecurityPolicyFilter.registerMetricsProvider();
ApiKeyManager.get().handleStartupProperties();
MailHelper.init();
AuditLogService.get().registerAuditType(new SystemUpgradeAuditProvider());
// Handle system maintenance startup properties as late as possible; we want all system maintenance tasks to be registered first
ContextListener.addStartupListener(new SystemMaintenanceStartupListener());
ContextListener.addStartupListener(new StartupPropertyStartupListener());
ContextListener.addStartupListener(new SystemUpgradeAuditProvider.SystemUpgradeStartupListener());
}

@Override
Expand Down Expand Up @@ -485,12 +490,14 @@ public void registerServlets(ServletContext servletCtx)
SubfolderWriter.TestCase.class,
SvgUtil.TestCase.class,
SwapQueue.TestCase.class,
SystemUpgradeAuditProvider.TestCase.class,
TSVMapWriter.Tests.class,
TSVWriter.TestCase.class,
TabLoader.HeaderMatchTest.class,
Table.IsSelectTestCase.class,
URIUtil.TestCase.class,
ValidEmail.TestCase.class,
VersionNumber.TestCase.class,
XmlBeansUtil.TestCase.class
);
}
Expand Down
2 changes: 1 addition & 1 deletion api/src/org/labkey/api/admin/AdminBean.java
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public static class RecentUser
public static final String servletContainer = ModuleLoader.getServletContext().getServerInfo();
public static final String servletConfiguration = "Embedded";
public static final String sessionTimeout = Formats.commaf0.format(ModuleLoader.getServletContext().getSessionTimeout());
public static final String buildTime = ModuleLoader.getInstance().getCoreModule().getBuildTime();
public static final @Nullable String buildTime = AppProps.getInstance().getBuildTime();
public static final String serverStartupTime = DateUtil.formatDateTime(ContainerManager.getRoot());

public static String asserts = "disabled";
Expand Down
9 changes: 8 additions & 1 deletion api/src/org/labkey/api/audit/AuditLogService.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.labkey.api.data.DbScope;
import org.labkey.api.data.SimpleFilter;
import org.labkey.api.data.Sort;
import org.labkey.api.data.Table;
import org.labkey.api.module.ModuleLoader;
import org.labkey.api.query.QueryService;
import org.labkey.api.query.UserSchema;
Expand Down Expand Up @@ -114,7 +115,13 @@ default <K extends AuditTypeEvent> void addEvents(@Nullable User user, List<K> e

<K extends AuditTypeEvent> List<K> getAuditEvents(Container container, User user, String eventType, @Nullable SimpleFilter filter, @Nullable Sort sort);

<K extends AuditTypeEvent> List<K> getAuditEvents(Container container, User user, String eventType, @Nullable SimpleFilter filter, @Nullable Sort sort, @Nullable ContainerFilter cf);
default <K extends AuditTypeEvent> List<K> getAuditEvents(Container container, User user, String eventType, @Nullable SimpleFilter filter, @Nullable Sort sort, @Nullable ContainerFilter cf)
{
return getAuditEvents(container, user, eventType, filter, sort, cf, Table.ALL_ROWS);
}

/** @param maxRows a positive count, or {@link Table#ALL_ROWS} */
<K extends AuditTypeEvent> List<K> getAuditEvents(Container container, User user, String eventType, @Nullable SimpleFilter filter, @Nullable Sort sort, @Nullable ContainerFilter cf, int maxRows);

UserSchema createSchema(User user, Container container);

Expand Down
2 changes: 1 addition & 1 deletion api/src/org/labkey/api/audit/DefaultAuditProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public <K extends AuditTypeEvent> List<K> getAuditEvents(Container container, Us
}

@Override
public <K extends AuditTypeEvent> List<K> getAuditEvents(Container container, User user, String eventType, @Nullable SimpleFilter filter, @Nullable Sort sort, @Nullable ContainerFilter cf)
public <K extends AuditTypeEvent> List<K> getAuditEvents(Container container, User user, String eventType, @Nullable SimpleFilter filter, @Nullable Sort sort, @Nullable ContainerFilter cf, int maxRows)
{
return Collections.emptyList();
}
Expand Down
Loading