ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-22 17:09:00 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Minor: expose a started getting on AbstractNode and check for double starts. Expose findMyLocation as public.

Browse Source
This commit is contained in:
Mike Hearn
2016-05-11 18:07:11 +02:00
committed by Mike Hearn
parent c5f7849689
commit 474054411d
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
node/src/main/kotlin/core/node/AbstractNode.kt
View File

@ -4,14 +4,13 @@ import api.APIServer
import api.APIServerImpl import api.APIServerImpl
import com.codahale.metrics.MetricRegistry import com.codahale.metrics.MetricRegistry
import com.google.common.util.concurrent.ListenableFuture import com.google.common.util.concurrent.ListenableFuture
import com.google.common.util.concurrent.MoreExecutors
import com.google.common.util.concurrent.SettableFuture import com.google.common.util.concurrent.SettableFuture
import core.RunOnCallerThread
import core.crypto.Party import core.crypto.Party
import core.messaging.MessagingService import core.messaging.MessagingService
import core.messaging.StateMachineManager import core.messaging.StateMachineManager
import core.messaging.runOnNextMessage import core.messaging.runOnNextMessage
import core.node.services.* import core.node.services.*
import core.node.subsystems.*
import core.node.storage.CheckpointStorage import core.node.storage.CheckpointStorage
import core.node.storage.PerFileCheckpointStorage import core.node.storage.PerFileCheckpointStorage
import core.node.subsystems.* import core.node.subsystems.*
@ -76,7 +75,7 @@ abstract class AbstractNode(val dir: Path, val configuration: NodeConfiguration,
NodeInfo(net.myAddress, storage.myLegalIdentity, advertisedServices, findMyLocation()) NodeInfo(net.myAddress, storage.myLegalIdentity, advertisedServices, findMyLocation())
} }
protected open fun findMyLocation(): PhysicalLocation? = CityDatabase[configuration.nearestCity] open fun findMyLocation(): PhysicalLocation? = CityDatabase[configuration.nearestCity]
lateinit var storage: StorageService lateinit var storage: StorageService
lateinit var smm: StateMachineManager lateinit var smm: StateMachineManager
@ -92,7 +91,12 @@ abstract class AbstractNode(val dir: Path, val configuration: NodeConfiguration,
@Volatile var networkMapRegistrationFuture: ListenableFuture<Unit>? = null @Volatile var networkMapRegistrationFuture: ListenableFuture<Unit>? = null
private set private set
/** Set to true once [start] has been successfully called. */
@Volatile var started = false
private set
open fun start(): AbstractNode { open fun start(): AbstractNode {
require(!started) { "Node has already been started" }
log.info("Node starting up ...") log.info("Node starting up ...")
storage = initialiseStorageService(dir) storage = initialiseStorageService(dir)
@ -115,6 +119,7 @@ abstract class AbstractNode(val dir: Path, val configuration: NodeConfiguration,
startMessagingService() startMessagingService()
networkMapRegistrationFuture = registerWithNetworkMap() networkMapRegistrationFuture = registerWithNetworkMap()
started = true
return this return this
} }
/** /**
@ -156,7 +161,7 @@ abstract class AbstractNode(val dir: Path, val configuration: NodeConfiguration,
val future = SettableFuture.create<NetworkMapService.RegistrationResponse>() val future = SettableFuture.create<NetworkMapService.RegistrationResponse>()
val topic = NetworkMapService.REGISTER_PROTOCOL_TOPIC + "." + sessionID val topic = NetworkMapService.REGISTER_PROTOCOL_TOPIC + "." + sessionID
net.runOnNextMessage(topic, MoreExecutors.directExecutor()) { message -> net.runOnNextMessage(topic, RunOnCallerThread) { message ->
future.set(message.data.deserialize()) future.set(message.data.deserialize())
} }
net.send(message, serviceInfo.address) net.send(message, serviceInfo.address)