You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/01/23 12:59:06 UTC
[3/3] cayenne git commit: Log ignored runtime JDBC properties
rephrase message and cleanup
Log ignored runtime JDBC properties
rephrase message and cleanup
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/14f17536
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/14f17536
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/14f17536
Branch: refs/heads/master
Commit: 14f1753652906fc5e2c8b3e0e23126397826937c
Parents: f46a304
Author: Nikita Timofeev <st...@gmail.com>
Authored: Tue Jan 23 15:58:01 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Tue Jan 23 15:58:01 2018 +0300
----------------------------------------------------------------------
.../server/DelegatingDataSourceFactory.java | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/14f17536/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DelegatingDataSourceFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DelegatingDataSourceFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DelegatingDataSourceFactory.java
index 5bfbc2b..5381ca5 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DelegatingDataSourceFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DelegatingDataSourceFactory.java
@@ -125,12 +125,15 @@ public class DelegatingDataSourceFactory implements DataSourceFactory {
}
private void findUnusedProperties(DataNodeDescriptor nodeDescriptor) {
+ if(!logger.isInfoEnabled() || nodeDescriptor.getDataChannelDescriptor() == null) {
+ return;
+ }
boolean found = false;
StringBuilder logResult = new StringBuilder();
String nodeName = nodeDescriptor.getDataChannelDescriptor().getName()
+ "."
+ nodeDescriptor.getName();
- logResult.append("Found unused runtime properties for '").append(nodeName).append("': ");
+ logResult.append("Following runtime properties were ignored for node '").append(nodeName).append("': ");
String[] verifiableProperties = new String[] {
Constants.JDBC_USERNAME_PROPERTY, Constants.JDBC_PASSWORD_PROPERTY,
Constants.JDBC_MAX_CONNECTIONS_PROPERTY, Constants.JDBC_MIN_CONNECTIONS_PROPERTY,
@@ -149,9 +152,9 @@ public class DelegatingDataSourceFactory implements DataSourceFactory {
}
}
if (found) {
- logResult.delete(logResult.length() - 2, logResult.length());
- logResult.append(". This runtime properties was ignored. Configuration were taken from project DataSource. ");
- logResult.append("For using configuration from runtime properties, move driver and url configuration to properties.");
+ logResult.delete(logResult.length() - 2, logResult.length())
+ .append(". Will use project DataSource configuration. ")
+ .append("Set driver and url properties to enable DataSource configuration override. ");
logger.info(logResult.toString());
}
}
@@ -170,9 +173,7 @@ public class DelegatingDataSourceFactory implements DataSourceFactory {
}
if (driver == null) {
- if ((channelName != null) && (logger.isInfoEnabled())) {
- findUnusedProperties(nodeDescriptor);
- }
+ findUnusedProperties(nodeDescriptor);
return false;
}
@@ -183,9 +184,7 @@ public class DelegatingDataSourceFactory implements DataSourceFactory {
}
if (url == null) {
- if ((channelName != null) && (logger.isInfoEnabled())) {
- findUnusedProperties(nodeDescriptor);
- }
+ findUnusedProperties(nodeDescriptor);
return false;
}