From 52eea5cce63ba341ed54dde7fc4278979c3af2bf Mon Sep 17 00:00:00 2001 From: Jason Song Date: Fri, 16 Jun 2017 14:21:11 +0800 Subject: [PATCH] Revert "use custom connection validator instead of sending SELECT 1 query" This reverts commit f6816a26fec105918506b474d93a2bcb14fb4905. --- .../common/utils/DataSourceValidator.java | 27 ------------------- .../src/main/resources/application.properties | 3 +-- 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 apollo-common/src/main/java/com/ctrip/framework/apollo/common/utils/DataSourceValidator.java diff --git a/apollo-common/src/main/java/com/ctrip/framework/apollo/common/utils/DataSourceValidator.java b/apollo-common/src/main/java/com/ctrip/framework/apollo/common/utils/DataSourceValidator.java deleted file mode 100644 index ae1e4d1d7..000000000 --- a/apollo-common/src/main/java/com/ctrip/framework/apollo/common/utils/DataSourceValidator.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.ctrip.framework.apollo.common.utils; - -import org.apache.tomcat.jdbc.pool.Validator; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.sql.Connection; - -/** - * @author Jason Song(song_s@ctrip.com) - */ -public class DataSourceValidator implements Validator { - private static final Logger LOGGER = LoggerFactory.getLogger(DataSourceValidator.class); - private static final int DEFAULT_VALIDATE_TIMEOUT_IN_SECONDS = 5; - - @Override - public boolean validate(Connection connection, int validateAction) { - boolean isValid = false; - try { - isValid = connection.isValid(DEFAULT_VALIDATE_TIMEOUT_IN_SECONDS); - } catch (Throwable ex) { - LOGGER.warn("Data source validation error", ex); - } - - return isValid; - } -} diff --git a/apollo-common/src/main/resources/application.properties b/apollo-common/src/main/resources/application.properties index cd6bc8f3d..d5fd3b29f 100644 --- a/apollo-common/src/main/resources/application.properties +++ b/apollo-common/src/main/resources/application.properties @@ -3,8 +3,7 @@ spring.http.converters.preferred-json-mapper=gson # DataSource spring.datasource.testWhileIdle=true spring.datasource.testOnBorrow=true -spring.datasource.validatorClassName=com.ctrip.framework.apollo.common.utils.DataSourceValidator -spring.datasource.validationInterval=5000 +spring.datasource.validationQuery=SELECT 1 spring.datasource.initSQL=set names utf8mb4 # Naming strategy -- GitLab