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

Fixed final bug in remote protocol, now refactoring should (finally) be complete

Browse source
This commit is contained in:
Jonas Bonér 2010-05-16 11:58:20 +02:00
parent 5ff29d2851
commit 7d9df1026b
2 changed files with 45 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

3
akka-core/src/main/scala/actor/ActorRef.scala
View file

@ -1216,8 +1216,7 @@ private[akka] case class RemoteActorRef private[akka] (
timeout = _timeout
start
Thread.sleep(1000)
val remoteClient = RemoteClient.clientFor(hostname, port)
lazy val remoteClient = RemoteClient.clientFor(hostname, port)
def postMessageToMailbox(message: Any, senderOption: Option[ActorRef]): Unit = {
val requestBuilder = RemoteRequestProtocol.newBuilder

82
akka-core/src/test/scala/RemoteSupervisorSpec.scala
View file

@ -35,6 +35,7 @@ object Log {
}
override def postRestart(reason: Throwable) {
println("================= POST RESTART")
Log.messageLog.put(reason.getMessage)
}
}
@ -50,6 +51,7 @@ object Log {
}
override def postRestart(reason: Throwable) {
println("================= POST RESTART")
Log.messageLog.put(reason.getMessage)
}
}
@ -65,6 +67,7 @@ object Log {
}
override def postRestart(reason: Throwable) {
println("================= POST RESTART")
Log.messageLog.put(reason.getMessage)
}
}
@ -105,7 +108,7 @@ class RemoteSupervisorSpec extends JUnitSuite {
pingpong1 !! BinaryString("Die")
}
expect("DIE") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
}
@ -118,21 +121,21 @@ class RemoteSupervisorSpec extends JUnitSuite {
}
expect("ping") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
intercept[RuntimeException] {
pingpong1 !! BinaryString("Die")
}
expect("DIE") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
expect("pong") {
(pingpong1 !! BinaryString("Ping")).getOrElse("nil")
}
expect("ping") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
}
@ -145,7 +148,7 @@ class RemoteSupervisorSpec extends JUnitSuite {
}
expect("DIE") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
}
@ -153,26 +156,29 @@ class RemoteSupervisorSpec extends JUnitSuite {
Log.messageLog.clear
val sup = getSingleActorAllForOneSupervisor
sup.start
expect("pong") {
(pingpong1 !! BinaryString("Ping")).getOrElse("nil")
}
expect("ping") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
intercept[RuntimeException] {
pingpong1 !! BinaryString("Die")
}
expect("DIE") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
expect("pong") {
(pingpong1 !! BinaryString("Ping")).getOrElse("nil")
}
expect("ping") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
}
@ -181,11 +187,11 @@ class RemoteSupervisorSpec extends JUnitSuite {
val sup = getMultipleActorsOneForOneConf
sup.start
intercept[RuntimeException] {
pingpong3 !! BinaryString("Die")
pingpong1 !! BinaryString("Die")
}
expect("DIE") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
}
@ -206,20 +212,20 @@ class RemoteSupervisorSpec extends JUnitSuite {
}
expect("ping") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
expect("ping") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
expect("ping") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
intercept[RuntimeException] {
pingpong2 !! BinaryString("Die")
}
expect("DIE") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
expect("pong") {
(pingpong1 !! BinaryString("Ping")).getOrElse("nil")
@ -234,13 +240,13 @@ class RemoteSupervisorSpec extends JUnitSuite {
}
expect("ping") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
expect("ping") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
expect("ping") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
}
@ -253,13 +259,13 @@ class RemoteSupervisorSpec extends JUnitSuite {
}
expect("DIE") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
expect("DIE") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
expect("DIE") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
}
@ -280,26 +286,26 @@ class RemoteSupervisorSpec extends JUnitSuite {
}
expect("ping") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
expect("ping") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
expect("ping") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
intercept[RuntimeException] {
pingpong2 !! BinaryString("Die")
}
expect("DIE") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
expect("DIE") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
expect("DIE") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
expect("pong") {
(pingpong1 !! BinaryString("Ping")).getOrElse("nil")
@ -314,13 +320,13 @@ class RemoteSupervisorSpec extends JUnitSuite {
}
expect("ping") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
expect("ping") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
expect("ping") {
Log.messageLog.poll(1, TimeUnit.SECONDS)
Log.messageLog.poll(5, TimeUnit.SECONDS)
}
}
@ -411,15 +417,15 @@ class RemoteSupervisorSpec extends JUnitSuite {
Supervise(
pingpong1,
LifeCycle(Permanent))
::
Supervise(
pingpong2,
LifeCycle(Permanent))
::
Supervise(
pingpong3,
LifeCycle(Permanent))
:: Nil))
::
Supervise(
pingpong2,
LifeCycle(Permanent))
::
Supervise(
pingpong3,
LifeCycle(Permanent))
:: Nil))
factory.newInstance
}