feat: ✨ update pool2 to v2.6.0 and I made the setting almost same as …

…that of pool v1
debasishg · Oct 29, 2018 · 5f95dae · 5f95dae
1 parent c0a9249
commit 5f95dae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build.sbt b/build.sbt
@@ -18,7 +18,7 @@ lazy val commonSettings: Seq[Setting[_]] = Seq(
 lazy val coreSettings = commonSettings ++ Seq(
   name := "RedisClient",
   libraryDependencies ++= Seq(
-    "commons-pool"      %  "commons-pool"            % "2.5.0",
+    "commons-pool"      %  "commons-pool"            % "2.6.0",
     "org.slf4j"         %  "slf4j-api"               % "1.7.25",
     "org.slf4j"         %  "slf4j-log4j12"           % "1.7.25"      % "provided",
     "log4j"             %  "log4j"                   % "1.2.17"      % "provided",

diff --git a/src/main/scala/com/redis/Pool.scala b/src/main/scala/com/redis/Pool.scala
@@ -36,14 +36,14 @@ object RedisClientPool {
 class RedisClientPool(val host: String, val port: Int, val maxIdle: Int = 8, val database: Int = 0, val secret: Option[Any] = None, val timeout : Int = 0,
                       val maxConnections: Int = RedisClientPool.UNLIMITED_CONNECTIONS, val poolWaitTimeout: Long = 3000) {
 
-  val objectPoolConfig = new GenericObjectPoolConfig
+  val objectPoolConfig = new GenericObjectPoolConfig[RedisClient]
   objectPoolConfig.setMaxIdle(maxIdle)
   objectPoolConfig.setMaxTotal(maxConnections)
-  objectPoolConfig.setJmxEnabled(false)
   objectPoolConfig.setBlockWhenExhausted(true)
+  objectPoolConfig.setTestOnBorrow(false)
+  objectPoolConfig.setTestOnReturn(true)
 
   val abandonedConfig = new AbandonedConfig
-  abandonedConfig.setRemoveAbandonedOnBorrow(true)
   abandonedConfig.setRemoveAbandonedTimeout(TimeUnit.MILLISECONDS.toSeconds(poolWaitTimeout).toInt)
   val pool = new GenericObjectPool(new RedisClientFactory(host, port, database, secret, timeout), objectPoolConfig,abandonedConfig)
   override def toString: String = host + ":" + String.valueOf(port)