SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable ignoring sql exceptions

Browse Source 
Primarily useful for composite repository configuration,
the flag provides an ability to ignore database exceptions
so that the system would be able to continue working with
other repositories.

Fixes gh-1653
This commit is contained in:
Serge Khodorkovsky
2020-07-17 08:24:37 -04:00
committed by spencergibb
parent 781584db84
commit 7a6b32fcd8
2 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentProperties.java
View File

@@ -40,6 +40,11 @@ public class JdbcEnvironmentProperties implements EnvironmentRepositoryPropertie
/** SQL used to query database for keys and values. */
private String sql = DEFAULT_SQL;
/**
* Flag to determine how to handle query exceptions.
*/
private boolean failOnError = true;
public boolean isEnabled() {
return enabled;
}
@@ -65,4 +70,12 @@ public class JdbcEnvironmentProperties implements EnvironmentRepositoryPropertie
this.sql = sql;
}
public boolean isFailOnError() {
return failOnError;
}
public void setFailOnError(boolean failOnError) {
this.failOnError = failOnError;
}
}

36
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepository.java
View File

@@ -27,6 +27,9 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.cloud.config.environment.Environment;
import org.springframework.cloud.config.environment.PropertySource;
import org.springframework.core.Ordered;
@@ -50,6 +53,8 @@ import org.springframework.util.StringUtils;
*/
public class JdbcEnvironmentRepository implements EnvironmentRepository, Ordered {
private static Log logger = LogFactory.getLog(JdbcEnvironmentRepository.class);
private final JdbcTemplate jdbc;
private final PropertiesResultSetExtractor extractor = new PropertiesResultSetExtractor();
@@ -58,11 +63,14 @@ public class JdbcEnvironmentRepository implements EnvironmentRepository, Ordered
private String sql;
private boolean failOnError;
public JdbcEnvironmentRepository(JdbcTemplate jdbc,
JdbcEnvironmentProperties properties) {
this.jdbc = jdbc;
this.order = properties.getOrder();
this.sql = properties.getSql();
this.failOnError = properties.isFailOnError();
}
public String getSql() {
@@ -99,10 +107,22 @@ public class JdbcEnvironmentRepository implements EnvironmentRepository, Ordered
Collections.reverse(envs);
for (String app : applications) {
for (String env : envs) {
Map<String, String> next = (Map<String, String>) this.jdbc.query(this.sql,
new Object[] { app, env, label }, this.extractor);
if (!next.isEmpty()) {
environment.add(new PropertySource(app + "-" + env, next));
try {
Map<String, String> next = (Map<String, String>) this.jdbc.query(
this.sql, new Object[] { app, env, label }, this.extractor);
if (!next.isEmpty()) {
environment.add(new PropertySource(app + "-" + env, next));
}
}
catch (DataAccessException e) {
if (!failOnError) {
if (logger.isDebugEnabled()) {
logger.debug("Failed to retrieve configuration from JDBC Repository", e);
}
}
else {
throw e;
}
}
}
}
@@ -118,6 +138,14 @@ public class JdbcEnvironmentRepository implements EnvironmentRepository, Ordered
this.order = order;
}
public boolean isFailOnError() {
return failOnError;
}
public void setFailOnError(boolean failOnError) {
this.failOnError = failOnError;
}
}
class PropertiesResultSetExtractor implements ResultSetExtractor<Map<String, String>> {