wrap up local routing
- pull some more generic stuff out of the individual routers, add factories which take only target lists - add router parsing to Deployer, removing everything which is not strictly related to local scope, which left only few things, so move them to Deployer.scala and delete DeploymentConfig - fix ConfiguredLocalRoutingSpec to use the new configuration mechanism and verify that configuration overrides code - fix DeployerSpec by using (mostly) correct lookup paths and removing everything which was not local - change config file layout, removing everything which is not local from akka-actor/.../reference.conf, putting the remote stuff into the akka-remote/.../reference.conf (unused as of yet); adapt comments according to changed functionality
This commit is contained in:
parent
d8bc57dc17
commit
0a7e5fe296
22 changed files with 209 additions and 1427 deletions
|
|
@ -87,7 +87,7 @@ class RemoteActorRefProvider(
|
|||
*/
|
||||
|
||||
@scala.annotation.tailrec
|
||||
def lookupRemotes(p: Iterable[String]): Option[DeploymentConfig.Deploy] = {
|
||||
def lookupRemotes(p: Iterable[String]): Option[Deploy] = {
|
||||
p.headOption match {
|
||||
case None ⇒ None
|
||||
case Some("remote") ⇒ lookupRemotes(p.drop(2))
|
||||
|
|
@ -104,7 +104,7 @@ class RemoteActorRefProvider(
|
|||
})
|
||||
|
||||
deployment match {
|
||||
case Some(DeploymentConfig.Deploy(_, _, _, _, RemoteDeploymentConfig.RemoteScope(address))) ⇒
|
||||
case Some(Deploy(_, _, _, _, RemoteScope(address))) ⇒
|
||||
if (address == rootPath.address) local.actorOf(system, props, supervisor, path, false)
|
||||
else address.parse(remote.transports) match {
|
||||
case Left(x) ⇒
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue