Print to screen and log basic info (#356)

Adding an extra logger to printBasicNodeInfo in both console and log file, respectively. Also, node's legal name is now printed to console as well.

config/dev/log4j2.xml

@@ -16,6 +16,11 @@
             <PatternLayout pattern="%highlight{%level{length=1} %d{HH:mm:ss} [%t] %c{2}.%M - %msg%n}{INFO=white,WARN=red,FATAL=bright red}" />
         </Console>
 
+        <!-- Required for printBasicInfo -->
+        <Console name="Console-Appender-Println" target="SYSTEM_OUT">
+            <PatternLayout pattern="%msg%n" />
+        </Console>
+
         <!-- Will generate up to 10 log files for a given day. During every rollover it will delete
              those that are older than 60 days, but keep the most recent 10 GB -->
         <RollingFile name="RollingFile-Appender"
@@ -48,5 +53,9 @@
             <AppenderRef ref="Console-Appender" level="${sys:consoleLogLevel}"/>
             <AppenderRef ref="RollingFile-Appender" />
         </Root>
+        <Logger name="BasicInfo" additivity="false">
+            <AppenderRef ref="Console-Appender-Println"/>
+            <AppenderRef ref="RollingFile-Appender" />
+        </Logger>
     </Loggers>
 </Configuration>

config/test/log4j2.xml

@@ -7,6 +7,10 @@
         <Console name="Console-Appender" target="SYSTEM_OUT">
             <PatternLayout pattern="[%-5level] %d{HH:mm:ss.SSS} [%t] %c{2}.%M - %msg%n" />
         </Console>
+        <!-- Required for printBasicInfo -->
+        <Console name="Console-Appender-Println" target="SYSTEM_OUT">
+            <PatternLayout pattern="%msg%n" />
+        </Console>
     </Appenders>
     <Loggers>
         <Root level="info">
@@ -15,5 +19,8 @@
         <Logger name="net.corda" level="${sys:defaultLogLevel}" additivity="false">
             <AppenderRef ref="Console-Appender"/>
         </Logger>
+        <Logger name="BasicInfo" additivity="false">
+            <AppenderRef ref="Console-Appender-Println"/>
+        </Logger>
     </Loggers>
 </Configuration>

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"
-        val msg = if (info == null) description else "${description.padEnd(40)}: $info"
+    val loggerName = if (renderBasicInfoToConsole) "BasicInfo" else "Main"
-        println(msg)
+    LoggerFactory.getLogger(loggerName).info(msg)
-    } else {
-        val msg = if (info == null) description else "$description: $info"
-        LoggerFactory.getLogger("Main").info(msg)
-    }
 }
 
 fun main(args: Array<String>) {
@@ -125,7 +121,7 @@ fun main(args: Array<String>) {
 
         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)

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 {

samples/simm-valuation-demo/src/main/resources/log4j2.xml

@@ -18,6 +18,11 @@
             </PatternLayout>
         </Console>
 
+        <!-- Required for printBasicInfo -->
+        <Console name="Console-Appender-Println" target="SYSTEM_OUT">
+            <PatternLayout pattern="%msg%n" />
+        </Console>
+
         <!-- Will generate up to 10 log files for a given day. During every rollover it will delete
              those that are older than 60 days, but keep the most recent 10 GB -->
         <RollingFile name="RollingFile-Appender"
@@ -50,6 +55,10 @@
             <AppenderRef ref="Console-Appender" level="info"/>
             <AppenderRef ref="RollingFile-Appender" level="debug"/>
         </Root>
+        <Logger name="BasicInfo" additivity="false">
+            <AppenderRef ref="Console-Appender-Println"/>
+            <AppenderRef ref="RollingFile-Appender" />
+        </Logger>
     </Loggers>
 
 </Configuration>