reject invalid ActorSystem names, see #1898

only allows domain-name-component compatible names (for simplicity)
This commit is contained in:
Roland 2012-04-03 15:14:40 +02:00
parent ae021a2f55
commit bcbe878ec6
4 changed files with 54 additions and 32 deletions

View file

@ -28,7 +28,7 @@ akka {
/blub {
router = round-robin
nr-of-instances = 2
target.nodes = ["akka://remote_sys@localhost:12347"]
target.nodes = ["akka://remote-sys@localhost:12347"]
}
/elastic-blub {
router = round-robin
@ -36,10 +36,10 @@ akka {
lower-bound = 2
upper-bound = 3
}
target.nodes = ["akka://remote_sys@localhost:12347"]
target.nodes = ["akka://remote-sys@localhost:12347"]
}
/remote-blub {
remote = "akka://remote_sys@localhost:12347"
remote = "akka://remote-sys@localhost:12347"
router = round-robin
nr-of-instances = 2
}
@ -47,12 +47,12 @@ akka {
remote = "akka://RemoteRouterSpec"
router = round-robin
nr-of-instances = 2
target.nodes = ["akka://remote_sys@localhost:12347"]
target.nodes = ["akka://remote-sys@localhost:12347"]
}
/local-blub2 {
router = round-robin
nr-of-instances = 4
target.nodes = ["akka://remote_sys@localhost:12347"]
target.nodes = ["akka://remote-sys@localhost:12347"]
}
}
}
@ -67,7 +67,7 @@ akka.actor.deployment {
nr-of-instances = 4
}
}""").withFallback(system.settings.config)
val other = ActorSystem("remote_sys", conf)
val other = ActorSystem("remote-sys", conf)
override def atTermination() {
other.shutdown()
@ -84,13 +84,13 @@ akka.actor.deployment {
val children = replies.toSet
children must have size 2
children.map(_.parent) must have size 1
children foreach (_.address.toString must be === "akka://remote_sys@localhost:12347")
children foreach (_.address.toString must be === "akka://remote-sys@localhost:12347")
system.stop(router)
}
"deploy its children on remote host driven by programatic definition" in {
val router = system.actorOf(Props[Echo].withRouter(new RemoteRouterConfig(RoundRobinRouter(2),
Seq(Address("akka", "remote_sys", "localhost", 12347)))), "blub2")
Seq(Address("akka", "remote-sys", "localhost", 12347)))), "blub2")
val replies = for (i 1 to 5) yield {
router ! ""
expectMsgType[ActorRef].path
@ -98,7 +98,7 @@ akka.actor.deployment {
val children = replies.toSet
children must have size 2
children.map(_.parent) must have size 1
children foreach (_.address.toString must be === "akka://remote_sys@localhost:12347")
children foreach (_.address.toString must be === "akka://remote-sys@localhost:12347")
system.stop(router)
}
@ -111,13 +111,13 @@ akka.actor.deployment {
val children = replies.toSet
children.size must be >= 2
children.map(_.parent) must have size 1
children foreach (_.address.toString must be === "akka://remote_sys@localhost:12347")
children foreach (_.address.toString must be === "akka://remote-sys@localhost:12347")
system.stop(router)
}
"deploy remote routers based on configuration" in {
val router = system.actorOf(Props[Echo].withRouter(FromConfig), "remote-blub")
router.path.address.toString must be("akka://remote_sys@localhost:12347")
router.path.address.toString must be("akka://remote-sys@localhost:12347")
val replies = for (i 1 to 5) yield {
router ! ""
expectMsgType[ActorRef].path
@ -127,14 +127,14 @@ akka.actor.deployment {
val parents = children.map(_.parent)
parents must have size 1
parents.head must be(router.path)
children foreach (_.address.toString must be === "akka://remote_sys@localhost:12347")
children foreach (_.address.toString must be === "akka://remote-sys@localhost:12347")
system.stop(router)
}
"deploy remote routers based on explicit deployment" in {
val router = system.actorOf(Props[Echo].withRouter(RoundRobinRouter(2))
.withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("akka://remote_sys@localhost:12347")))), "remote-blub2")
router.path.address.toString must be("akka://remote_sys@localhost:12347")
.withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("akka://remote-sys@localhost:12347")))), "remote-blub2")
router.path.address.toString must be("akka://remote-sys@localhost:12347")
val replies = for (i 1 to 5) yield {
router ! ""
expectMsgType[ActorRef].path
@ -144,13 +144,13 @@ akka.actor.deployment {
val parents = children.map(_.parent)
parents must have size 1
parents.head must be(router.path)
children foreach (_.address.toString must be === "akka://remote_sys@localhost:12347")
children foreach (_.address.toString must be === "akka://remote-sys@localhost:12347")
system.stop(router)
}
"let remote deployment be overridden by local configuration" in {
val router = system.actorOf(Props[Echo].withRouter(RoundRobinRouter(2))
.withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("akka://remote_sys@localhost:12347")))), "local-blub")
.withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("akka://remote-sys@localhost:12347")))), "local-blub")
router.path.address.toString must be("akka://RemoteRouterSpec")
val replies = for (i 1 to 5) yield {
router ! ""
@ -160,15 +160,15 @@ akka.actor.deployment {
children must have size 2
val parents = children.map(_.parent)
parents must have size 1
parents.head.address must be(Address("akka", "remote_sys", "localhost", 12347))
children foreach (_.address.toString must be === "akka://remote_sys@localhost:12347")
parents.head.address must be(Address("akka", "remote-sys", "localhost", 12347))
children foreach (_.address.toString must be === "akka://remote-sys@localhost:12347")
system.stop(router)
}
"let remote deployment router be overridden by local configuration" in {
val router = system.actorOf(Props[Echo].withRouter(RoundRobinRouter(2))
.withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("akka://remote_sys@localhost:12347")))), "local-blub2")
router.path.address.toString must be("akka://remote_sys@localhost:12347")
.withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("akka://remote-sys@localhost:12347")))), "local-blub2")
router.path.address.toString must be("akka://remote-sys@localhost:12347")
val replies = for (i 1 to 5) yield {
router ! ""
expectMsgType[ActorRef].path
@ -178,14 +178,14 @@ akka.actor.deployment {
val parents = children.map(_.parent)
parents must have size 1
parents.head must be(router.path)
children foreach (_.address.toString must be === "akka://remote_sys@localhost:12347")
children foreach (_.address.toString must be === "akka://remote-sys@localhost:12347")
system.stop(router)
}
"let remote deployment be overridden by remote configuration" in {
val router = system.actorOf(Props[Echo].withRouter(RoundRobinRouter(2))
.withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("akka://remote_sys@localhost:12347")))), "remote-override")
router.path.address.toString must be("akka://remote_sys@localhost:12347")
.withDeploy(Deploy(scope = RemoteScope(AddressFromURIString("akka://remote-sys@localhost:12347")))), "remote-override")
router.path.address.toString must be("akka://remote-sys@localhost:12347")
val replies = for (i 1 to 5) yield {
router ! ""
expectMsgType[ActorRef].path
@ -195,7 +195,7 @@ akka.actor.deployment {
val parents = children.map(_.parent)
parents must have size 1
parents.head must be(router.path)
children foreach (_.address.toString must be === "akka://remote_sys@localhost:12347")
children foreach (_.address.toString must be === "akka://remote-sys@localhost:12347")
system.stop(router)
}