diff options
Diffstat (limited to 'pdf-as-web-db')
-rw-r--r-- | pdf-as-web-db/build.gradle | 6 | ||||
-rw-r--r-- | pdf-as-web-db/src/main/java/at/gv/egiz/pdfas/web/store/DBRequestStore.java | 11 |
2 files changed, 10 insertions, 7 deletions
diff --git a/pdf-as-web-db/build.gradle b/pdf-as-web-db/build.gradle index e2ee78cf..d2b6fb02 100644 --- a/pdf-as-web-db/build.gradle +++ b/pdf-as-web-db/build.gradle @@ -17,9 +17,9 @@ dependencies { implementation project (':pdf-as-web') implementation project (':pdf-as-web-status') implementation project (':pdf-as-web-statistic-api') - api "org.hibernate:hibernate-core:5.6.14.Final" - api "org.hibernate:hibernate-entitymanager:5.6.14.Final" - implementation 'ch.qos.logback:logback-classic:1.2.11' + api "org.hibernate:hibernate-core:5.6.15.Final" + api "org.hibernate:hibernate-entitymanager:5.6.15.Final" + implementation 'ch.qos.logback:logback-classic:1.2.12' implementation group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion } diff --git a/pdf-as-web-db/src/main/java/at/gv/egiz/pdfas/web/store/DBRequestStore.java b/pdf-as-web-db/src/main/java/at/gv/egiz/pdfas/web/store/DBRequestStore.java index 5afb28e4..e5a789d2 100644 --- a/pdf-as-web-db/src/main/java/at/gv/egiz/pdfas/web/store/DBRequestStore.java +++ b/pdf-as-web-db/src/main/java/at/gv/egiz/pdfas/web/store/DBRequestStore.java @@ -4,12 +4,12 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; -import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.Configuration; +import org.hibernate.query.Query; import org.hibernate.service.ServiceRegistry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,6 +33,8 @@ public class DBRequestStore implements IRequestStore { public DBRequestStore() { final Configuration cfg = new Configuration(); cfg.addAnnotatedClass(Request.class); + cfg.addAnnotatedClass(Response.class); + cfg.addAnnotatedClass(StatisticRequest.class); cfg.setProperties(WebConfiguration.getHibernateProps()); serviceRegistry = new StandardServiceRegistryBuilder().applySettings( @@ -46,7 +48,7 @@ public class DBRequestStore implements IRequestStore { final Calendar calendar = Calendar.getInstance(); calendar.add(Calendar.SECOND, -1 * seconds); final Date date = calendar.getTime(); - final SimpleDateFormat dt = new SimpleDateFormat("yyyy-mm-dd hh:mm:ss"); + final SimpleDateFormat dt = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); logger.info("Clearing Entries before: " + dt.format(date)); Session session = null; Transaction tx = null; @@ -57,6 +59,7 @@ public class DBRequestStore implements IRequestStore { + " where req.created < :date"); query.setCalendar("date", calendar); query.executeUpdate(); + tx.commit(); } catch (final Throwable e) { logger.error("Failed to save Request", e); tx.rollback(); @@ -72,7 +75,7 @@ public class DBRequestStore implements IRequestStore { final Calendar calendar = Calendar.getInstance(); calendar.add(Calendar.SECOND, -1 * seconds); final Date date = calendar.getTime(); - final SimpleDateFormat dt = new SimpleDateFormat("yyyy-mm-dd hh:mm:ss"); + final SimpleDateFormat dt = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); logger.info("Clearing Entries before: " + dt.format(date)); Session session = null; try { @@ -91,7 +94,7 @@ public class DBRequestStore implements IRequestStore { + " where req.created < :date"); queryResponse.setCalendar("date", calendar); queryResponse.executeUpdate(); - + } finally { if (session != null) { session.close(); |