diff --git a/wrapper/src/main/java/software/amazon/jdbc/DriverConnectionProvider.java b/wrapper/src/main/java/software/amazon/jdbc/DriverConnectionProvider.java index bcc9cdf87..4c97729d5 100644 --- a/wrapper/src/main/java/software/amazon/jdbc/DriverConnectionProvider.java +++ b/wrapper/src/main/java/software/amazon/jdbc/DriverConnectionProvider.java @@ -128,9 +128,8 @@ public Connection connect( } } - LOGGER.finest(() -> "Connecting to " + urlBuilder); - LOGGER.finest(() -> PropertyUtils.logProperties(props, "Connecting with properties: \n")); - + LOGGER.finest(() -> "Connecting to " + urlBuilder + + PropertyUtils.logProperties(props, "\nwith properties: \n")); return this.driver.connect(urlBuilder.toString(), props); } diff --git a/wrapper/src/main/java/software/amazon/jdbc/plugin/failover/ClusterAwareReaderFailoverHandler.java b/wrapper/src/main/java/software/amazon/jdbc/plugin/failover/ClusterAwareReaderFailoverHandler.java index dcbfa375b..58af99059 100644 --- a/wrapper/src/main/java/software/amazon/jdbc/plugin/failover/ClusterAwareReaderFailoverHandler.java +++ b/wrapper/src/main/java/software/amazon/jdbc/plugin/failover/ClusterAwareReaderFailoverHandler.java @@ -393,10 +393,11 @@ public ReaderFailoverResult call() { LOGGER.fine( () -> Messages.get( "ClusterAwareReaderFailoverHandler.attemptingReaderConnection", - new Object[] {this.newHost.getUrl()})); + new Object[] {this.newHost.getUrl(), initialConnectionProps})); try { - final Connection conn = pluginService.forceConnect(this.newHost, initialConnectionProps); + final Properties copy = new Properties(initialConnectionProps); + final Connection conn = pluginService.forceConnect(this.newHost, copy); pluginService.setAvailability(this.newHost.asAliases(), HostAvailability.AVAILABLE); LOGGER.fine( () -> Messages.get( diff --git a/wrapper/src/main/resources/messages.properties b/wrapper/src/main/resources/messages.properties index cd886deb8..f97cb44b4 100644 --- a/wrapper/src/main/resources/messages.properties +++ b/wrapper/src/main/resources/messages.properties @@ -52,7 +52,7 @@ AwsWrapperDataSource.missingDriver=Can't find a suitable driver for ''{0}'' # Cluster Aware Reader Failover Handler ClusterAwareReaderFailoverHandler.interruptedThread=Thread was interrupted. -ClusterAwareReaderFailoverHandler.attemptingReaderConnection=Trying to connect to reader: ''{0}'' +ClusterAwareReaderFailoverHandler.attemptingReaderConnection=Trying to connect to reader: ''{0}'', with properties ''{1}'' ClusterAwareReaderFailoverHandler.successfulReaderConnection=Connected to reader: ''{0}'' ClusterAwareReaderFailoverHandler.failedReaderConnection=Failed to connect to reader: ''{0}'' ClusterAwareReaderFailoverHandler.invalidTopology=''{0}'' was called with an invalid (null or empty) topology.