Skip to content

Commit

Permalink
Merge pull request #859 from mwisnicki/fix-pool-name
Browse files Browse the repository at this point in the history
Set unique poolName based on database name
mkurz authored Jun 26, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents c3500d9 + 83efdb4 commit 4beb6bb
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions src/core/src/main/scala/play/api/db/slick/SlickApi.scala
Original file line number Diff line number Diff line change
@@ -8,8 +8,10 @@ import scala.util.Success
import scala.util.Try
import scala.util.control.NonFatal
import com.typesafe.config.Config
import javax.inject.Inject
import com.typesafe.config.ConfigValue
import com.typesafe.config.ConfigValueFactory

import javax.inject.Inject
import play.api.Configuration
import play.api.Environment
import play.api.Logger
@@ -94,11 +96,15 @@ object DefaultSlickApi {

@throws(classOf[PlayException])
private def create(): DatabaseConfig[BasicProfile] = {
try DatabaseConfig.forConfig[BasicProfile](path = "", config = config)
val config2 =
if (config.hasPath("db.poolName")) config
else
config.withValue("db.poolName", ConfigValueFactory.fromAnyRef(s"$name.db"))
try DatabaseConfig.forConfig[BasicProfile](path = "", config = config2)
catch {
case NonFatal(t) =>
logger.error(s"Failed to create Slick database config for key $name.", t)
throw Configuration(config).reportError(name, s"Cannot connect to database [$name]", Some(t))
throw Configuration(config2).reportError(name, s"Cannot connect to database [$name]", Some(t))
}
}

0 comments on commit 4beb6bb

Please sign in to comment.