node: Use proper logging in Driver

This commit is contained in:
Andras Slemmer
2016-08-02 10:22:42 +01:00
parent 35da6b5388
commit 303858c3e4
3 changed files with 10 additions and 3 deletions

View File

@ -9,6 +9,8 @@ import com.r3corda.node.services.config.NodeConfiguration
import com.r3corda.node.services.messaging.ArtemisMessagingClient import com.r3corda.node.services.messaging.ArtemisMessagingClient
import com.r3corda.node.services.network.InMemoryNetworkMapCache import com.r3corda.node.services.network.InMemoryNetworkMapCache
import com.r3corda.node.services.network.NetworkMapService import com.r3corda.node.services.network.NetworkMapService
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import java.net.ServerSocket import java.net.ServerSocket
import java.net.Socket import java.net.Socket
import java.net.SocketException import java.net.SocketException
@ -57,6 +59,8 @@ sealed class PortAllocation {
} }
} }
private val log: Logger = LoggerFactory.getLogger("Driver")
/** /**
* TODO: remove quasarJarPath once we have a proper way of bundling quasar * TODO: remove quasarJarPath once we have a proper way of bundling quasar
*/ */
@ -238,7 +242,7 @@ class DriverDSL(
nearestCity = pickA(city), nearestCity = pickA(city),
legalName = networkMapName legalName = networkMapName
) )
println("Starting network-map-service") log.info("Starting network-map-service")
registerProcess(startNode(driverCliParams, quasarJarPath, debugPort)) registerProcess(startNode(driverCliParams, quasarJarPath, debugPort))
} }

View File

@ -13,11 +13,15 @@ import com.r3corda.node.services.network.NetworkMapService
import joptsimple.ArgumentAcceptingOptionSpec import joptsimple.ArgumentAcceptingOptionSpec
import joptsimple.OptionParser import joptsimple.OptionParser
import joptsimple.OptionSet import joptsimple.OptionSet
import org.slf4j.Logger
import org.slf4j.LoggerFactory
import java.nio.file.Path import java.nio.file.Path
import java.nio.file.Paths import java.nio.file.Paths
import java.security.PublicKey import java.security.PublicKey
import java.util.* import java.util.*
private val log: Logger = LoggerFactory.getLogger("NodeRunner")
class NodeRunner { class NodeRunner {
companion object { companion object {
@JvmStatic fun main(arguments: Array<String>) { @JvmStatic fun main(arguments: Array<String>) {
@ -57,8 +61,7 @@ class NodeRunner {
advertisedServices = services.toSet() advertisedServices = services.toSet()
) )
log.info("Starting $legalName with services $services on addresses $messagingAddress and $apiAddress")
println("Starting $legalName with services $services on addresses $messagingAddress and $apiAddress")
node.start() node.start()
} }
} }