From 5e19bad4b5728bb710289dcef63f61629cc6534a Mon Sep 17 00:00:00 2001
From: Mike Hearn <mike@r3cev.com>
Date: Wed, 8 Mar 2017 18:21:02 +0100
Subject: [PATCH] Minor: don't use a separate thread to start Metrics-to-JMX
 export.

This should hopefully resolve a shutdown hang due to the misnamed "WebServer" thread not being a daemon thread.
---
 node/src/main/kotlin/net/corda/node/internal/Node.kt | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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