From 445a2a432b3c15fd7e4bbf0e112df39466db29a9 Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Wed, 21 Feb 2018 15:10:40 +0100 Subject: Rework DB connection URL Add timeout parameters to the DB URL Issue-ID: CLAMP-85 Change-Id: I4cb3f2b4f8744bc240a49440f720b11328927dd6 Signed-off-by: Determe, Sebastien (sd378r) --- extra/docker/clamp/clamp.env | 3 ++- src/main/resources/application.properties | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/extra/docker/clamp/clamp.env b/extra/docker/clamp/clamp.env index 9c724740a..47ec08f63 100644 --- a/extra/docker/clamp/clamp.env +++ b/extra/docker/clamp/clamp.env @@ -1 +1,2 @@ -SPRING_APPLICATION_JSON={"spring.datasource.cldsdb.url":"jdbc:mariadb:sequential://db:3306/cldsdb4?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647","org.onap.clamp.config.files.cldsPolicyConfig":"classpath:/clds/clds-policy-config.properties","org.onap.clamp.config.files.cldsReference":"classpath:/clds/clds-reference.properties"} \ No newline at end of file +### Be careful, this must be in one line only ### +SPRING_APPLICATION_JSON={"spring.datasource.cldsdb.url":"jdbc:mariadb:sequential://db:3306/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3","org.onap.clamp.config.files.cldsPolicyConfig":"classpath:/clds/clds-policy-config.properties","org.onap.clamp.config.files.cldsReference":"classpath:/clds/clds-reference.properties"} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index dd4ea6d36..38a719d8e 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -88,7 +88,7 @@ camel.springboot.xmlRoutes=classpath:/clds/camel/*.xml #clds datasource connection details spring.datasource.cldsdb.driverClassName=org.mariadb.jdbc.Driver -spring.datasource.cldsdb.url=jdbc:mariadb:sequential://localhost:${docker.mariadb.port.host}/cldsdb4?autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647 +spring.datasource.cldsdb.url=jdbc:mariadb:sequential://localhost:${docker.mariadb.port.host}/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3 spring.datasource.cldsdb.username=clds spring.datasource.cldsdb.password=4c90a0b48204383f4283448d23e0b885a47237b2a23588e7c4651604f51c1067 spring.datasource.cldsdb.validationQuery=SELECT 1 -- cgit 1.2.3-korg