mirrors/eclair
1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2024-11-20 10:39:19 +01:00
Code Issues Projects Releases Wiki Activity

Increase startup timeout (#577) (#590)

Browse Source
This commit is contained in:
Gustavo Fernandes 2018-05-18 10:55:53 +01:00 committed by Fabrice Drouin
parent 3058ce343d
commit f983160288
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eclair-core/src/main/scala/fr/acinq/eclair/Setup.scala
View File

@ -102,7 +102,7 @@ class Setup(datadir: File, overrideDefaults: Config = ConfigFactory.empty(), act
unspentAddresses <- bitcoinClient.invoke("listunspent").collect { case JArray(values) => values.map(value => (value \ "address").extract[String]) } unspentAddresses <- bitcoinClient.invoke("listunspent").collect { case JArray(values) => values.map(value => (value \ "address").extract[String]) }
} yield (progress, chainHash, bitcoinVersion, unspentAddresses) } yield (progress, chainHash, bitcoinVersion, unspentAddresses)
// blocking sanity checks // blocking sanity checks
val (progress, chainHash, bitcoinVersion, unspentAddresses) = Await.result(future, 10 seconds) val (progress, chainHash, bitcoinVersion, unspentAddresses) = Await.result(future, 30 seconds)
assert(bitcoinVersion.startsWith("16"), "Eclair requires Bitcoin Core 0.16.0 or higher") assert(bitcoinVersion.startsWith("16"), "Eclair requires Bitcoin Core 0.16.0 or higher")
assert(chainHash == nodeParams.chainHash, s"chainHash mismatch (conf=${nodeParams.chainHash} != bitcoind=$chainHash)") assert(chainHash == nodeParams.chainHash, s"chainHash mismatch (conf=${nodeParams.chainHash} != bitcoind=$chainHash)")
if (chainHash != Block.RegtestGenesisBlock.hash) { if (chainHash != Block.RegtestGenesisBlock.hash) {

1
eclair-node/src/main/resources/application.conf
View File

@ -1,6 +1,7 @@
akka { akka {
loggers = ["akka.event.slf4j.Slf4jLogger"] loggers = ["akka.event.slf4j.Slf4jLogger"]
logger-startup-timeout = 30s
loglevel = "INFO" loglevel = "INFO"
io { io {