raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Removing deployId from config, should be replaced with patterns in deployment configuration that is checked towards the address

Browse source
This commit is contained in:
Viktor Klang 2011-09-19 15:20:52 +02:00
parent f993219f91
commit b66d45ec6c
14 changed files with 43 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

18
akka-actor/src/main/scala/akka/routing/Routing.scala
View file

@ -134,10 +134,10 @@ object Routing {
/**
* FIXME: will very likely be moved to the ActorRef.
*/
def actorOf(props: RoutedProps): ActorRef = {
def actorOf(props: RoutedProps, address: String = newUuid().toString): ActorRef = {
//TODO Implement support for configuring by deployment ID etc
//TODO If deployId matches an already created actor (Ahead-of-time deployed) return that actor
//TODO If deployId exists in config, it will override the specified Props (should we attempt to merge?)
//TODO If address matches an already created actor (Ahead-of-time deployed) return that actor
//TODO If address exists in config, it will override the specified Props (should we attempt to merge?)
//TODO If the actor deployed uses a different config, then ignore or throw exception?
val clusteringEnabled = ReflectiveAccess.ClusterModule.isEnabled
@ -146,10 +146,10 @@ object Routing {
if (clusteringEnabled && !props.localOnly)
ReflectiveAccess.ClusterModule.newClusteredActorRef(props)
else {
if (props.connections.isEmpty)
if (props.connections.isEmpty) //FIXME Shouldn't this be checked when instance is created so that it works with linking instead of barfing?
throw new IllegalArgumentException("A routed actorRef can't have an empty connection set")
new RoutedActorRef(props)
new RoutedActorRef(props, address)
}
}
@ -188,9 +188,9 @@ object Routing {
new RoutedProps(
() ⇒ router,
RoutedProps.defaultFailureDetectorFactory,
actorAddress,
connections,
RoutedProps.defaultTimeout, true))
RoutedProps.defaultTimeout, true),
actorAddress)
}
}
@ -201,8 +201,6 @@ abstract private[akka] class AbstractRoutedActorRef(val props: RoutedProps) exte
val router = props.routerFactory()
def address = props.deployId
override def postMessageToMailbox(message: Any, channel: UntypedChannel) = {
val sender = channel match {
case ref: ActorRef ⇒ Some(ref)
@ -225,7 +223,7 @@ abstract private[akka] class AbstractRoutedActorRef(val props: RoutedProps) exte
* A RoutedActorRef is an ActorRef that has a set of connected ActorRef and it uses a Router to send a message to
* on (or more) of these actors.
*/
private[akka] class RoutedActorRef(val routedProps: RoutedProps) extends AbstractRoutedActorRef(routedProps) {
private[akka] class RoutedActorRef(val routedProps: RoutedProps, val address: String) extends AbstractRoutedActorRef(routedProps) {
@volatile
private var running: Boolean = true