mirror of
https://github.com/bitcoin-s/bitcoin-s.git
synced 2025-02-24 15:02:17 +01:00
Fix race condition between NodeAppConfig.migrate()
calls when bitcoin-s.tor.enabled=false
(#5120)
* Fix race condition between NodeAppConfig.migrate() calls * Use Future.traverse()
This commit is contained in:
parent
6befad2dd3
commit
b0cf3d8146
1 changed files with 4 additions and 3 deletions
|
@ -95,10 +95,11 @@ case class BitcoinSAppConfig(
|
|||
|
||||
val startedTorDependentConfigsF = for {
|
||||
_ <- torConfig
|
||||
_ <- Future.sequence(torDependentConfigs.map(_.start()))
|
||||
_ <- migrateTorDependentDbConfigsF
|
||||
_ <- Future.traverse(torDependentConfigs)(_.start())
|
||||
} yield ()
|
||||
|
||||
val startedNonTorConfigs = {
|
||||
val startedNonTorConfigsF = {
|
||||
for {
|
||||
_ <- Future.traverse(nonTorConfigs)(_.start())
|
||||
} yield ()
|
||||
|
@ -106,7 +107,7 @@ case class BitcoinSAppConfig(
|
|||
|
||||
for {
|
||||
_ <- migrateTorDependentDbConfigsF
|
||||
_ <- startedNonTorConfigs
|
||||
_ <- startedNonTorConfigsF
|
||||
} yield {
|
||||
logger.info(
|
||||
s"Done starting BitcoinSAppConfig, it took=${TimeUtil.currentEpochMs - start}ms")
|
||||
|
|
Loading…
Add table
Reference in a new issue