You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2021/02/04 20:33:02 UTC
[activemq-artemis] branch master updated (0190ad4 -> 337df52)
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git.
from 0190ad4 This closes #3430
new 4b314e2 NO-JIRA fix JDBC parsing typo
new b4f8aad ARTEMIS-3092 inconsistent JDBC config logging
new 337df52 This closes #3427
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../artemis/jdbc/store/drivers/JDBCDataSourceUtils.java | 13 ++++++-------
.../activemq/artemis/journal/ActiveMQJournalLogger.java | 4 ++++
.../artemis/core/config/impl/ConfigurationImpl.java | 5 ++---
.../core/deployers/impl/FileConfigurationParser.java | 2 +-
4 files changed, 13 insertions(+), 11 deletions(-)
[activemq-artemis] 03/03: This closes #3427
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 337df5286c03768c29644ae4623def1d4da179ac
Merge: 0190ad4 b4f8aad
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Thu Feb 4 15:32:52 2021 -0500
This closes #3427
.../artemis/jdbc/store/drivers/JDBCDataSourceUtils.java | 13 ++++++-------
.../activemq/artemis/journal/ActiveMQJournalLogger.java | 4 ++++
.../artemis/core/config/impl/ConfigurationImpl.java | 5 ++---
.../core/deployers/impl/FileConfigurationParser.java | 2 +-
4 files changed, 13 insertions(+), 11 deletions(-)
[activemq-artemis] 02/03: ARTEMIS-3092 inconsistent JDBC config
logging
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit b4f8aada3c97a707b4d6dd31df5045655d901245
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Tue Feb 2 14:07:28 2021 -0600
ARTEMIS-3092 inconsistent JDBC config logging
---
.../artemis/jdbc/store/drivers/JDBCDataSourceUtils.java | 13 ++++++-------
.../activemq/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 5e0c3d8..97d295e 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<String, Object> 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<String, Object> 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 09513db..fdd9eb1 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 558d178..5ff3e9c 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(",");
[activemq-artemis] 01/03: NO-JIRA fix JDBC parsing typo
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 4b314e2aab3556694651ee4b1c43c9223f555953
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Tue Feb 2 14:06:43 2021 -0600
NO-JIRA fix JDBC parsing typo
---
.../activemq/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 6274042..2a13012 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));