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

Removing Channel(s), tryTell etc, everything compiles but all tests are semibroken

Browse source
This commit is contained in:
Viktor Klang 2011-10-22 16:06:20 +02:00
parent cccf6b4ed9
commit 1b730b5c82
96 changed files with 353 additions and 742 deletions
Download patch file Download diff file Expand all files Collapse all files

16
akka-remote/src/main/scala/akka/remote/Remote.scala
View file

@ -75,8 +75,10 @@ class Remote(val app: AkkaApplication) extends RemoteService {
val remote = new akka.remote.netty.NettyRemoteSupport(app)
remote.start(hostname, port)
remote.register(remoteDaemonServiceName, remoteDaemon)
app.eventHandler.addListener(eventStream.channel)
app.eventHandler.addListener(eventStream.sender)
app.eventHandler.addListener(remoteClientLifeCycleHandler)
// TODO actually register this provider in app in remote mode
//provider.register(ActorRefProvider.RemoteProvider, new RemoteActorRefProvider)
remote
@ -161,10 +163,10 @@ class RemoteSystemDaemon(remote: Remote) extends Actor {
eventHandler.error(this, "Actor 'address' for actor to instantiate is not defined, ignoring remote system daemon command [%s]".format(message))
}
channel ! Success(address.toString)
sender ! Success(address.toString)
} catch {
case error: Throwable ⇒
channel ! Failure(error)
sender ! Failure(error)
throw error
}
}
@ -182,10 +184,10 @@ class RemoteSystemDaemon(remote: Remote) extends Actor {
// gossiper tell gossip
// channel ! Success(address.toString)
// sender ! Success(address.toString)
// } catch {
// case error: Throwable ⇒
// channel ! Failure(error)
// sender ! Failure(error)
// throw error
// }
}
@ -204,7 +206,7 @@ class RemoteSystemDaemon(remote: Remote) extends Actor {
new LocalActorRef(app,
Props(
context ⇒ {
case f: Function0[_] ⇒ try { channel ! f() } finally { context.self.stop() }
case f: Function0[_] ⇒ try { sender ! f() } finally { context.self.stop() }
}).copy(dispatcher = computeGridDispatcher), app.guardian, Props.randomAddress, systemService = true) forward payloadFor(message, classOf[Function0[Any]])
}
@ -222,7 +224,7 @@ class RemoteSystemDaemon(remote: Remote) extends Actor {
new LocalActorRef(app,
Props(
context ⇒ {
case (fun: Function[_, _], param: Any) ⇒ try { channel ! fun.asInstanceOf[Any ⇒ Any](param) } finally { context.self.stop() }
case (fun: Function[_, _], param: Any) ⇒ try { sender ! fun.asInstanceOf[Any ⇒ Any](param) } finally { context.self.stop() }
}).copy(dispatcher = computeGridDispatcher), app.guardian, Props.randomAddress, systemService = true) forward payloadFor(message, classOf[Tuple2[Function1[Any, Any], Any]])
}