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

Add 'finance' module to Corda WebServer, for plugins to use. (#489)

Browse Source 
* Add 'finance' module to Corda WebServer, for plugins to use.
* Fix wording of error message.

(cherry picked from commit 352da7e)
This commit is contained in:
Chris Rankin 2017-04-03 17:06:30 +01:00 committed by Patrick Kuo
parent b0bb7cc606
commit f1a168046d
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/demobench/src/test/kotlin/net/corda/demobench/model/NodeConfigTest.kt
View File

@ -220,6 +220,8 @@ class NodeConfigTest {
assertEquals(localPort(20001), webConfig.webAddress)
assertEquals(localPort(10001), webConfig.p2pAddress)
assertEquals("trustpass", webConfig.trustStorePassword)
assertEquals("cordacadevpass", webConfig.keyStorePassword)
}
@Test

3
webserver/build.gradle
View File

@ -31,6 +31,7 @@ sourceSets {
dependencies {
compile project(':core')
compile project(':finance')
compile project(':client:rpc')
compile project(':client:jackson')
testCompile project(':node')
@ -61,4 +62,4 @@ dependencies {
task integrationTest(type: Test) {
testClassesDir = sourceSets.integrationTest.output.classesDir
classpath = sourceSets.integrationTest.runtimeClasspath
}
}

5
webserver/src/main/kotlin/net/corda/webserver/internal/NodeWebServer.kt
View File

@ -161,6 +161,11 @@ class NodeWebServer(val config: WebServerConfig) {
} catch (e: java.nio.file.NoSuchFileException) {
log.debug("Tried to open a file that doesn't yet exist, retrying", e)
Thread.sleep(retryDelay)
} catch (e: Throwable) {
// E.g. a plugin cannot be instantiated?
// Note that we do want the exception stacktrace.
log.error("Cannot start WebServer", e)
throw e
}
}
}