StakeSquid/dshackle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #46 from p2p-org/fix_threads

Browse Source 
fix threads loss
This commit is contained in:
MaxFomenkov
2022-11-29 14:27:43 +04:00
committed by GitHub
parent feb9cb6a0f d922a1507a
commit f780a545ef
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -36,7 +36,7 @@ group = 'io.emeraldpay.dshackle'
// Version schema: // Version schema:
// x.x.x for production, following SemVer model // x.x.x for production, following SemVer model
// x.x.x-SNAPSHOT for development // x.x.x-SNAPSHOT for development
version = '0.14.0-SNAPSHOT' version = '0.15.0-SNAPSHOT'
java { java {
sourceCompatibility = JavaVersion.VERSION_13 sourceCompatibility = JavaVersion.VERSION_13
@@ -177,7 +177,7 @@ jib {
} }
} }
container { container {
jvmFlags = ['-Xms1024m', '-XX:MaxRAMPercentage=60'] jvmFlags = ['-Xms1024m', '-Xmx4g']
mainClass = 'io.emeraldpay.dshackle.StarterKt' mainClass = 'io.emeraldpay.dshackle.StarterKt'
args = [] args = []
ports = ['2448', '2449', '8545'] ports = ['2448', '2449', '8545']

11
src/main/kotlin/io/emeraldpay/dshackle/upstream/AbstractHead.kt
View File

@@ -53,11 +53,12 @@ abstract class AbstractHead(
val delay = System.currentTimeMillis() - lastHeadUpdated val delay = System.currentTimeMillis() - lastHeadUpdated
if (delay > awaitHeadTimeoutMs) { if (delay > awaitHeadTimeoutMs) {
log.warn("No head updates for $delay ms @ ${this.javaClass} - restart") log.warn("No head updates for $delay ms @ ${this.javaClass} - restart")
try { if (lock.tryLock()) {
lock.tryLock() try {
start() start()
} finally { } finally {
lock.unlock() lock.unlock()
}
} }
} }
}, 300, 30, TimeUnit.SECONDS }, 300, 30, TimeUnit.SECONDS