diff --git a/config/dev/log4j2.xml b/config/dev/log4j2.xml index caa9eb427f..820d5d73f1 100644 --- a/config/dev/log4j2.xml +++ b/config/dev/log4j2.xml @@ -16,6 +16,11 @@ + + + + + + + + + \ No newline at end of file diff --git a/config/test/log4j2.xml b/config/test/log4j2.xml index d656719c10..eca12924ef 100644 --- a/config/test/log4j2.xml +++ b/config/test/log4j2.xml @@ -7,6 +7,10 @@ + + + + @@ -15,5 +19,8 @@ + + + diff --git a/node/src/main/kotlin/net/corda/node/Corda.kt b/node/src/main/kotlin/net/corda/node/Corda.kt index 1ee6483321..a052a82cc6 100644 --- a/node/src/main/kotlin/net/corda/node/Corda.kt +++ b/node/src/main/kotlin/net/corda/node/Corda.kt @@ -25,13 +25,9 @@ private var renderBasicInfoToConsole = true /** Used for useful info that we always want to show, even when not logging to the console */ fun printBasicNodeInfo(description: String, info: String? = null) { - if (renderBasicInfoToConsole) { - val msg = if (info == null) description else "${description.padEnd(40)}: $info" - println(msg) - } else { - val msg = if (info == null) description else "$description: $info" - LoggerFactory.getLogger("Main").info(msg) - } + val msg = if (info == null) description else "${description.padEnd(40)}: $info" + val loggerName = if (renderBasicInfoToConsole) "BasicInfo" else "Main" + LoggerFactory.getLogger(loggerName).info(msg) } fun main(args: Array) { @@ -125,7 +121,7 @@ fun main(args: Array) { node.networkMapRegistrationFuture.success { val elapsed = (System.currentTimeMillis() - startTime) / 10 / 100.0 - printBasicNodeInfo("Node started up and registered in $elapsed sec") + printBasicNodeInfo("Node ${node.info.legalIdentity.name} started up and registered in $elapsed sec") if (renderBasicInfoToConsole) ANSIProgressObserver(node.smm) diff --git a/node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingServer.kt b/node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingServer.kt index 9fb9eacbc5..a38ab15015 100644 --- a/node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingServer.kt +++ b/node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingServer.kt @@ -139,7 +139,7 @@ class ArtemisMessagingServer(override val config: NodeConfiguration, registerPostQueueDeletionCallback { address, qName -> log.debug { "Queue deleted: $qName for $address" } } } activeMQServer.start() - printBasicNodeInfo("Node listening on address", myHostPort.toString()) + printBasicNodeInfo("Node ${this.config.myLegalName} listening on address", myHostPort.toString()) } private fun createArtemisConfig(): Configuration = ConfigurationImpl().apply { diff --git a/samples/simm-valuation-demo/src/main/resources/log4j2.xml b/samples/simm-valuation-demo/src/main/resources/log4j2.xml index a513f64966..b929e776d9 100644 --- a/samples/simm-valuation-demo/src/main/resources/log4j2.xml +++ b/samples/simm-valuation-demo/src/main/resources/log4j2.xml @@ -18,6 +18,11 @@ + + + + + + + + + \ No newline at end of file