From 4b314e2aab3556694651ee4b1c43c9223f555953 Mon Sep 17 00:00:00 2001 From: Justin Bertram Date: Tue, 2 Feb 2021 14:06:43 -0600 Subject: [PATCH 1/2] NO-JIRA fix JDBC parsing typo --- .../artemis/core/deployers/impl/FileConfigurationParser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java index 62740429d8..2a1301269b 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java @@ -1740,7 +1740,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil { DatabaseStorageConfiguration conf = new DatabaseStorageConfiguration(); conf.setBindingsTableName(getString(storeNode, "bindings-table-name", conf.getBindingsTableName(), Validators.NO_CHECK)); conf.setMessageTableName(getString(storeNode, "message-table-name", conf.getMessageTableName(), Validators.NO_CHECK)); - conf.setLargeMessageTableName(getString(storeNode, "large-message-table-name", conf.getJdbcConnectionUrl(), Validators.NO_CHECK)); + conf.setLargeMessageTableName(getString(storeNode, "large-message-table-name", conf.getLargeMessageTableName(), Validators.NO_CHECK)); conf.setPageStoreTableName(getString(storeNode, "page-store-table-name", conf.getPageStoreTableName(), Validators.NO_CHECK)); conf.setNodeManagerStoreTableName(getString(storeNode, "node-manager-store-table-name", conf.getNodeManagerStoreTableName(), Validators.NO_CHECK)); conf.setJdbcConnectionUrl(getString(storeNode, "jdbc-connection-url", conf.getJdbcConnectionUrl(), Validators.NO_CHECK)); From b4f8aada3c97a707b4d6dd31df5045655d901245 Mon Sep 17 00:00:00 2001 From: Justin Bertram Date: Tue, 2 Feb 2021 14:07:28 -0600 Subject: [PATCH 2/2] ARTEMIS-3092 inconsistent JDBC config logging --- .../jdbc/store/drivers/JDBCDataSourceUtils.java | 13 ++++++------- .../artemis/journal/ActiveMQJournalLogger.java | 4 ++++ .../artemis/core/config/impl/ConfigurationImpl.java | 5 ++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCDataSourceUtils.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCDataSourceUtils.java index 5e0c3d8309..97d295eb18 100644 --- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCDataSourceUtils.java +++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCDataSourceUtils.java @@ -16,8 +16,8 @@ */ package org.apache.activemq.artemis.jdbc.store.drivers; +import org.apache.activemq.artemis.journal.ActiveMQJournalLogger; import org.apache.commons.beanutils.PropertyUtils; -import org.jboss.logging.Logger; import javax.sql.DataSource; import java.util.Map; @@ -25,13 +25,12 @@ import java.util.stream.Collectors; public class JDBCDataSourceUtils { - private static final Logger logger = Logger.getLogger(JDBCDataSourceUtils.class); - public static DataSource getDataSource(String dataSourceClassName, Map dataSourceProperties) { - logger.info(new StringBuilder("Initialising JDBC data source: ").append(dataSourceClassName).append(" ") - .append(dataSourceProperties.keySet().stream() - .map(key -> key + "=" + dataSourceProperties.get(key)) - .collect(Collectors.joining(", ", "{", "}")))); + ActiveMQJournalLogger.LOGGER.initializingJdbcDataSource(dataSourceClassName, dataSourceProperties + .keySet() + .stream() + .map(key -> key + "=" + dataSourceProperties.get(key)) + .collect(Collectors.joining(", ", "{", "}"))); try { DataSource dataSource = (DataSource) Class.forName(dataSourceClassName).newInstance(); for (Map.Entry entry : dataSourceProperties.entrySet()) { diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java index 09513dbb08..fdd9eb1667 100644 --- a/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java @@ -85,6 +85,10 @@ public interface ActiveMQJournalLogger extends BasicLogger { @Message(id = 141009, value = "A Free File is less than the maximum data", format = Message.Format.MESSAGE_FORMAT) void fileTooSmall(); + @LogMessage(level = Logger.Level.INFO) + @Message(id = 141010, value = "Initialising JDBC data source {0} with properties {1}", format = Message.Format.MESSAGE_FORMAT) + void initializingJdbcDataSource(String dataSourceClassName, String dataSourceProperties); + @LogMessage(level = Logger.Level.WARN) @Message(id = 142000, value = "You have a native library with a different version than expected", format = Message.Format.MESSAGE_FORMAT) void incompatibleNativeLibrary(); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java index 558d1785ca..5ff3e9c7f4 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java @@ -1739,13 +1739,12 @@ public class ConfigurationImpl implements Configuration, Serializable { sb.append("clustered=").append(isClustered()).append(","); if (isJDBC()) { DatabaseStorageConfiguration dsc = (DatabaseStorageConfiguration) getStoreConfiguration(); - sb.append("jdbcDriverClassName=").append(dsc.getJdbcDriverClassName()).append(","); - sb.append("jdbcConnectionUrl=").append(dsc.getJdbcConnectionUrl()).append(","); + sb.append("jdbcDriverClassName=").append(dsc.getDataSourceProperty("driverClassName")).append(","); + sb.append("jdbcConnectionUrl=").append(dsc.getDataSourceProperty("url")).append(","); sb.append("messageTableName=").append(dsc.getMessageTableName()).append(","); sb.append("bindingsTableName=").append(dsc.getBindingsTableName()).append(","); sb.append("largeMessageTableName=").append(dsc.getLargeMessageTableName()).append(","); sb.append("pageStoreTableName=").append(dsc.getPageStoreTableName()).append(","); - } else { sb.append("journalDirectory=").append(journalDirectory).append(","); sb.append("bindingsDirectory=").append(bindingsDirectory).append(",");