From c8573bcde2221204ce700d499b5b533548f1a76f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pereira?= Date: Wed, 28 Oct 2020 12:30:08 +0000 Subject: [PATCH] Use failTimeout instead of failFast for Hikari >= 3.0.0 initializationFailFast has been removed from Hikari >= 3.0.0 and replaced with initializationFailTimeout. See https://github.com/brettwooldridge/HikariCP#infrequently-used --- .../java/org/dpppt/backend/sdk/ws/config/WSProdConfig.java | 5 +++-- .../src/main/resources/application.properties | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/java/org/dpppt/backend/sdk/ws/config/WSProdConfig.java b/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/java/org/dpppt/backend/sdk/ws/config/WSProdConfig.java index 5c26c763..290831a6 100644 --- a/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/java/org/dpppt/backend/sdk/ws/config/WSProdConfig.java +++ b/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/java/org/dpppt/backend/sdk/ws/config/WSProdConfig.java @@ -50,8 +50,8 @@ public class WSProdConfig extends WSBaseConfig { @Value("${datasource.driverClassName}") String dataSourceDriver; - @Value("${datasource.failFast}") - String dataSourceFailFast; + @Value("${datasource.failTimeout}") + String dataSourceFailTimeout; @Value("${datasource.maximumPoolSize}") String dataSourceMaximumPoolSize; @@ -84,6 +84,7 @@ public DataSource dataSource() { config.setMaxLifetime(Integer.parseInt(dataSourceMaxLifetime)); config.setIdleTimeout(Integer.parseInt(dataSourceIdleTimeout)); config.setConnectionTimeout(Integer.parseInt(dataSourceConnectionTimeout)); + config.setInitializationFailTimeout(Integer.parseInt(dataSourceFailTimeout)); return new HikariDataSource(config); } diff --git a/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/resources/application.properties b/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/resources/application.properties index 161a315f..4a172830 100644 --- a/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/resources/application.properties +++ b/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/resources/application.properties @@ -19,7 +19,7 @@ server.error.whitelabel.enabled=true # datasource.username=dpppt # datasource.password=dpppt # datasource.driverClassName=org.postgresql.ds.PGSimpleDataSource -# datasource.failFast=true +# datasource.failTimeout=1 # datasource.maximumPoolSize=5 # datasource.maxLifetime=1700000 # datasource.idleTimeout=600000