From b86ff2a32f91cf6ebfde1c6be579198bfb74828d Mon Sep 17 00:00:00 2001 From: Athou Date: Wed, 24 May 2023 08:14:59 +0200 Subject: [PATCH] logging tweaks --- .../main/java/com/commafeed/CommaFeedModule.java | 2 -- .../backend/service/DatabaseStartupService.java | 14 +++++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/commafeed-server/src/main/java/com/commafeed/CommaFeedModule.java b/commafeed-server/src/main/java/com/commafeed/CommaFeedModule.java index 1e95ccb0..cfe3bc2c 100644 --- a/commafeed-server/src/main/java/com/commafeed/CommaFeedModule.java +++ b/commafeed-server/src/main/java/com/commafeed/CommaFeedModule.java @@ -90,8 +90,6 @@ public class CommaFeedModule extends AbstractModule { .filter(MetricFilter.ALL) .build(graphite); reporter.start(graphiteInterval, TimeUnit.SECONDS); - } else { - log.info("Graphite Metrics Disabled. Metrics will not be sent."); } } } diff --git a/commafeed-server/src/main/java/com/commafeed/backend/service/DatabaseStartupService.java b/commafeed-server/src/main/java/com/commafeed/backend/service/DatabaseStartupService.java index df645aab..8aaa5b4c 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/service/DatabaseStartupService.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/service/DatabaseStartupService.java @@ -33,15 +33,17 @@ public class DatabaseStartupService implements Managed { private final CommaFeedConfiguration config; @Override - public void start() throws Exception { + public void start() { updateSchema(); - long count = UnitOfWork.call(sessionFactory, () -> userDAO.count()); + long count = UnitOfWork.call(sessionFactory, userDAO::count); if (count == 0) { UnitOfWork.run(sessionFactory, this::initialData); } } private void updateSchema() { + log.info("checking if database schema needs updating"); + Session session = sessionFactory.openSession(); session.doWork(connection -> { try { @@ -68,10 +70,12 @@ public class DatabaseStartupService implements Managed { } }); session.close(); + + log.info("database schema is up to date"); } private void initialData() { - log.info("Populating database with default values"); + log.info("populating database with default values"); try { userService.createAdminUser(); if (config.getApplicationSettings().getCreateDemoAccount()) { @@ -82,8 +86,4 @@ public class DatabaseStartupService implements Managed { } } - @Override - public void stop() throws Exception { - - } }