From 55fa7408eb17a40b3191e333e842346b4790680c Mon Sep 17 00:00:00 2001 From: torcato Date: Mon, 24 Jun 2024 15:33:50 +0200 Subject: [PATCH] Applying comment --- .../src/main/scala/raw/client/sql/SqlConnectionPool.scala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sql-client/src/main/scala/raw/client/sql/SqlConnectionPool.scala b/sql-client/src/main/scala/raw/client/sql/SqlConnectionPool.scala index b574c9b7d..a2e1846dd 100644 --- a/sql-client/src/main/scala/raw/client/sql/SqlConnectionPool.scala +++ b/sql-client/src/main/scala/raw/client/sql/SqlConnectionPool.scala @@ -11,7 +11,7 @@ */ package raw.client.sql -import com.google.common.cache.{CacheBuilder, CacheLoader, LoadingCache} +import com.google.common.cache.{CacheBuilder, CacheLoader, LoadingCache, RemovalNotification} import com.typesafe.scalalogging.StrictLogging import com.zaxxer.hikari.{HikariConfig, HikariDataSource} import raw.creds.api.CredentialsService @@ -68,6 +68,10 @@ class SqlConnectionPool(credentialsService: CredentialsService)(implicit setting .newBuilder() .maximumSize(connectionCacheSize) .expireAfterAccess(connectionCachePeriod) + .removalListener((notification: RemovalNotification[AuthenticatedUser, HikariDataSource]) => { + logger.info(s"Shutting down SQL connection pool for database ${notification.getValue.getJdbcUrl}") + RawUtils.withSuppressNonFatalException(notification.getValue.close()) + }) .build(dbCacheLoader) @throws[SQLException]