mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2024-11-20 02:11:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move slickDbConfig out of JdbcProfileComponent trait into AppConfig (#1510)

Browse Source 
* Move slickDbConfig out of JdbcProfileComponent trait into AppConfig

* Cleanup newliens
This commit is contained in:
Chris Stewart 2020-06-04 12:49:08 -05:00 committed by GitHub
parent 61d9f0efba
commit 3f5b11f3d3
3 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chain/src/main/scala/org/bitcoins/chain/config/ChainAppConfig.scala
View File

@ -30,7 +30,7 @@ case class ChainAppConfig(
ChainAppConfig(directory, useLogbackConf, configs: _*)
protected[bitcoins] def baseDatadir: Path = directory
override def appConfig: ChainAppConfig = this
override lazy val appConfig: ChainAppConfig = this
/**
* Checks whether or not the chain project is initialized by

24
db-commons/src/main/scala/org/bitcoins/db/AppConfig.scala
View File

@ -5,17 +5,14 @@ import java.nio.file.{Files, Path, Paths}
import ch.qos.logback.classic.Level
import com.typesafe.config._
import org.bitcoins.core.config.{MainNet, NetworkParameters, RegTest, TestNet3}
import org.bitcoins.core.protocol.blockchain.{
ChainParams,
MainNetChainParams,
RegTestNetChainParams,
TestNetChainParams
}
import org.bitcoins.core.protocol.blockchain.{ChainParams, MainNetChainParams, RegTestNetChainParams, TestNetChainParams}
import org.bitcoins.core.util.BitcoinSLogger
import slick.basic.DatabaseConfig
import slick.jdbc.JdbcProfile
import scala.concurrent.{ExecutionContext, Future}
import scala.util.Properties
import scala.util.matching.Regex
import scala.util.{Failure, Properties, Success, Try}
/**
* Everything needed to configure functionality
@ -300,6 +297,19 @@ abstract class AppConfig extends LoggerConfig {
override val useLogbackConf: Boolean =
config.getBooleanOrElse("logging.logback", default = false)
lazy val slickDbConfig: DatabaseConfig[JdbcProfile] = {
Try {
DatabaseConfig.forConfig[JdbcProfile](path = moduleName,
config = config)
} match {
case Success(value) =>
value
case Failure(exception) =>
logger.error(s"Error when loading database from config: $exception")
logger.error(s"Configuration: ${config.asReadableJson}")
throw exception
}
}
}
object AppConfig extends BitcoinSLogger {

16
db-commons/src/main/scala/org/bitcoins/db/JdbcProfileComponent.scala
View File

@ -6,8 +6,6 @@ import org.bitcoins.core.util.BitcoinSLogger
import slick.basic.DatabaseConfig
import slick.jdbc.JdbcProfile
import scala.util.{Failure, Success, Try}
trait JdbcProfileComponent[+ConfigType <: AppConfig] extends BitcoinSLogger {
def appConfig: ConfigType
@ -17,19 +15,7 @@ trait JdbcProfileComponent[+ConfigType <: AppConfig] extends BitcoinSLogger {
* that require datbase connections
*/
val dbConfig: DatabaseConfig[JdbcProfile] = {
val slickDbConfig = {
Try {
DatabaseConfig.forConfig[JdbcProfile](path = appConfig.moduleName,
config = appConfig.config)
} match {
case Success(value) =>
value
case Failure(exception) =>
logger.error(s"Error when loading database from config: $exception")
logger.error(s"Configuration: ${appConfig.config.asReadableJson}")
throw exception
}
}
val slickDbConfig = appConfig.slickDbConfig
logger.debug(s"Resolved DB config: ${slickDbConfig.config.asReadableJson}")