ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-22 14:22:28 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Minor: don't use a separate thread to start Metrics-to-JMX export.

Browse Source 
This should hopefully resolve a shutdown hang due to the misnamed "WebServer" thread not being a daemon thread.
This commit is contained in:
Mike Hearn 2017-03-08 18:21:02 +01:00
parent 42f2536dec
commit 5e19bad4b5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
node/src/main/kotlin/net/corda/node/internal/Node.kt
View File

@ -12,6 +12,7 @@ import net.corda.core.node.Version
import net.corda.core.node.services.ServiceInfo import net.corda.core.node.services.ServiceInfo
import net.corda.core.node.services.ServiceType import net.corda.core.node.services.ServiceType
import net.corda.core.node.services.UniquenessProvider import net.corda.core.node.services.UniquenessProvider
import net.corda.core.success
import net.corda.core.utilities.loggerFor import net.corda.core.utilities.loggerFor
import net.corda.node.printBasicNodeInfo import net.corda.node.printBasicNodeInfo
import net.corda.node.serialization.NodeClock import net.corda.node.serialization.NodeClock
@ -230,10 +231,11 @@ class Node(override val configuration: FullNodeConfiguration,
override fun start(): Node { override fun start(): Node {
alreadyRunningNodeCheck() alreadyRunningNodeCheck()
super.start() super.start()
// Only start the service API requests once the network map registration is complete
thread(name = "WebServer") { networkMapRegistrationFuture.success(serverThread) {
networkMapRegistrationFuture.getOrThrow() // Begin exporting our own metrics via JMX. These can be monitored using any agent, e.g. Jolokia:
// Begin exporting our own metrics via JMX. //
// https://jolokia.org/agent/jvm.html
JmxReporter. JmxReporter.
forRegistry(services.monitoringService.metrics). forRegistry(services.monitoringService.metrics).
inDomain("net.corda"). inDomain("net.corda").