Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Fix purging of syslog events (#1182)

Peter De Witteac95ca565090
diff --git a/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java b/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java
index 1842295ea..a1b3afedf 100644
--- a/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java
+++ b/manager/src/main/java/org/openremote/manager/syslog/SyslogService.java
@@ -132,8 +132,10 @@ public class SyslogService extends Handler implements ContainerService {
try {
persistenceService.doTransaction(em -> em.createQuery(
"delete from SyslogEvent e " +
- "where e.timestamp < now() - make_interval(0, 0, 0, 0, 0, :minutes, 0)"
- ).setParameter("minutes", config.getStoredMaxAgeMinutes()).executeUpdate());
+ "where e.timestamp <= :date")
+ .setParameter("date",
+ Date.from(Instant.now().minus(config.getStoredMaxAgeMinutes(), ChronoUnit.MINUTES)))
+ .executeUpdate());
} catch (Throwable e) {
LOG.log(Level.WARNING, "Failed to purge syslog events", e);
}