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

Fix in reading non-present manifest values in single tests

Browse Source
This commit is contained in:
Shams Asari 2017-03-13 18:37:16 +00:00
parent 31dc6e4b8f
commit bbbc4d9eaa
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
node/src/main/kotlin/net/corda/node/Corda.kt
View File

@ -38,15 +38,14 @@ fun main(args: Array<String>) {
val startTime = System.currentTimeMillis() val startTime = System.currentTimeMillis()
checkJavaVersion() checkJavaVersion()
val nodeVersionInfo = if (Manifests.exists("Corda-Version")) { // Manifest properties are only available if running from the corda jar
NodeVersionInfo( fun manifestValue(name: String): String? = if (Manifests.exists(name)) Manifests.read(name) else null
Version.parse(Manifests.read("Corda-Version")),
Manifests.read("Corda-Revision"), val nodeVersionInfo = NodeVersionInfo(
Manifests.read("Corda-Vendor")) manifestValue("Corda-Version")?.let { Version.parse(it) } ?: Version(0, 0, false),
} else { manifestValue("Corda-Revision") ?: "Unknown",
// If the manifest properties aren't available then we're running from within an IDE manifestValue("Corda-Vendor") ?: "Unknown"
NodeVersionInfo(Version(0, 0, false), "~Git revision unavailable~", "Unknown vendor") )
}
val argsParser = ArgsParser() val argsParser = ArgsParser()
@ -197,7 +196,7 @@ private fun drawBanner(nodeVersionInfo: NodeVersionInfo) {
/ / __ / ___/ __ / __ `/ """).fgBrightBlue().a(msg1).newline().fgBrightRed().a( / / __ / ___/ __ / __ `/ """).fgBrightBlue().a(msg1).newline().fgBrightRed().a(
"/ /___ /_/ / / / /_/ / /_/ / ").fgBrightBlue().a(msg2).newline().fgBrightRed().a( "/ /___ /_/ / / / /_/ / /_/ / ").fgBrightBlue().a(msg2).newline().fgBrightRed().a(
"""\____/ /_/ \__,_/\__,_/""").reset().newline().newline().fgBrightDefault().bold(). """\____/ /_/ \__,_/\__,_/""").reset().newline().newline().fgBrightDefault().bold().
a("--- ${nodeVersionInfo.vendor} ${nodeVersionInfo.version} (${nodeVersionInfo.revision.take(6)}) -----------------------------------------------"). a("--- ${nodeVersionInfo.vendor} ${nodeVersionInfo.version} (${nodeVersionInfo.revision.take(7)}) -----------------------------------------------").
newline(). newline().
newline(). newline().
a("${Emoji.books}New! ").reset().a("Training now available worldwide, see https://corda.net/corda-training/"). a("${Emoji.books}New! ").reset().a("Training now available worldwide, see https://corda.net/corda-training/").