From e7ee571a9ef93cce237caaf3da0c613883ca854d Mon Sep 17 00:00:00 2001 From: Dan Galdi Date: Thu, 18 Jul 2024 17:37:13 -0400 Subject: [PATCH] Add logging --- build.gradle.kts | 2 +- .../veupathdb/service/eda/subset/model/db/EntityFactory.java | 1 + .../veupathdb/service/eda/subset/model/db/PlatformUtils.java | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 065eada..156db1c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ // Project settings group = "org.veupathdb.eda" -version = "4.16.3" +version = "4.16.4" plugins { `java-library` diff --git a/src/main/java/org/veupathdb/service/eda/subset/model/db/EntityFactory.java b/src/main/java/org/veupathdb/service/eda/subset/model/db/EntityFactory.java index e43f03b..fc5825b 100644 --- a/src/main/java/org/veupathdb/service/eda/subset/model/db/EntityFactory.java +++ b/src/main/java/org/veupathdb/service/eda/subset/model/db/EntityFactory.java @@ -75,6 +75,7 @@ public TreeNode getStudyEntityTree(String studyId) { */ private boolean attributesTableExists(Entity entity) { PlatformUtils.DBPlatform platform = PlatformUtils.fromDataSource(_dataSource); + LOG.info("Found DB platform: " + platform); String wideTable = DB.Tables.Attributes.NAME(entity).toUpperCase(Locale.ROOT); if (platform == PlatformUtils.DBPlatform.PostgresDB) { String postgresTableExists = String.format("SELECT EXISTS (\n" + diff --git a/src/main/java/org/veupathdb/service/eda/subset/model/db/PlatformUtils.java b/src/main/java/org/veupathdb/service/eda/subset/model/db/PlatformUtils.java index c493439..f94be06 100644 --- a/src/main/java/org/veupathdb/service/eda/subset/model/db/PlatformUtils.java +++ b/src/main/java/org/veupathdb/service/eda/subset/model/db/PlatformUtils.java @@ -1,11 +1,15 @@ package org.veupathdb.service.eda.subset.model.db; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; import java.util.Arrays; public class PlatformUtils { + private static final Logger LOG = LogManager.getLogger(PlatformUtils.class); public enum DBPlatform { PostgresDB("PostgreSQL"), @@ -26,6 +30,7 @@ public String getProductName() { public static DBPlatform fromDataSource(DataSource dataSource) { try (Connection c = dataSource.getConnection()) { final String productName = c.getMetaData().getDatabaseProductName(); + LOG.info("Found product name: " + productName) return Arrays.stream(DBPlatform.values()) .filter(platform -> platform.getProductName().equals(productName)) .findAny()