Correct CRLF for BAT files and fixed templating of JAR names.

This commit is contained in:
Clinton Alexander
2017-02-23 11:32:19 +00:00
committed by Clinton Alexander
parent 75ff04d5a7
commit f786ff9312
6 changed files with 26 additions and 15 deletions

View File

@ -92,17 +92,14 @@ class NodeWebServer(val config: FullNodeConfiguration) {
val httpConfiguration = HttpConfiguration()
httpConfiguration.outputBufferSize = 32768
val httpConnector = ServerConnector(server, HttpConnectionFactory(httpConfiguration))
log.info("Starting webserver on address $address")
httpConnector.port = address.port
httpConnector
}
server.connectors = arrayOf<Connector>(connector)
server.handler = handlerCollection
//runOnStop += Runnable { server.stop() }
server.start()
log.info("Server started")
log.info("Embedded web server is listening on", "http://${InetAddress.getLocalHost().hostAddress}:${connector.port}/")
log.info("Starting webserver on address $address")
return server
}
@ -158,6 +155,12 @@ class NodeWebServer(val config: FullNodeConfiguration) {
} catch (e: ActiveMQNotConnectedException) {
log.debug("Could not connect to ${config.artemisAddress} due to exception: ", e)
Thread.sleep(retryDelay)
// This error will happen if the server has yet to create the keystore
// Keep the fully qualified package name due to collisions with the Kotlin stdlib
// exception of the same name
} catch (e: java.nio.file.NoSuchFileException) {
log.debug("Tried to open a file that doesn't yet exist, retrying", e)
Thread.sleep(retryDelay)
}
}
}