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

rename app: ActorSystem to system everywhere

Browse source
This commit is contained in:
Roland 2011-11-17 12:36:35 +01:00
parent c31695bef4
commit d381b72061
69 changed files with 344 additions and 343 deletions
Download patch file Download diff file Expand all files Collapse all files

18
akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
View file

@ -38,7 +38,7 @@ abstract class RemoteClient private[akka] (
val remoteSupport: NettyRemoteSupport,
val remoteAddress: RemoteAddress) {
val log = Logging(remoteSupport.app, this)
val log = Logging(remoteSupport.system, this)
val name = simpleName(this) + "@" + remoteAddress
@ -147,7 +147,7 @@ class ActiveRemoteClient private[akka] (
def sendSecureCookie(connection: ChannelFuture) {
val handshake = RemoteControlProtocol.newBuilder.setCommandType(CommandType.CONNECT)
if (SECURE_COOKIE.nonEmpty) handshake.setCookie(SECURE_COOKIE.get)
val addr = remoteSupport.app.rootPath.remoteAddress
val addr = remoteSupport.system.rootPath.remoteAddress
handshake.setOrigin(RemoteProtocol.AddressProtocol.newBuilder.setHostname(addr.hostname).setPort(addr.port).build)
connection.getChannel.write(remoteSupport.createControlEnvelope(handshake.build))
}
@ -349,10 +349,10 @@ class ActiveRemoteClientHandler(
/**
* Provides the implementation of the Netty remote support
*/
class NettyRemoteSupport(_app: ActorSystem) extends RemoteSupport(_app) with RemoteMarshallingOps {
class NettyRemoteSupport(_system: ActorSystem) extends RemoteSupport(_system) with RemoteMarshallingOps {
val serverSettings = new RemoteServerSettings(app.settings.config, app.settings.DefaultTimeUnit)
val clientSettings = new RemoteClientSettings(app.settings.config, app.settings.DefaultTimeUnit)
val serverSettings = new RemoteServerSettings(system.settings.config, system.settings.DefaultTimeUnit)
val clientSettings = new RemoteClientSettings(system.settings.config, system.settings.DefaultTimeUnit)
private val remoteClients = new HashMap[RemoteAddress, RemoteClient]
private val clientsLock = new ReadWriteGuard
@ -429,7 +429,7 @@ class NettyRemoteSupport(_app: ActorSystem) extends RemoteSupport(_app) with Rem
def name = currentServer.get match {
case Some(server) ⇒ server.name
case None ⇒ "Non-running NettyRemoteServer@" + app.rootPath.remoteAddress
case None ⇒ "Non-running NettyRemoteServer@" + system.rootPath.remoteAddress
}
private val _isRunning = new Switch(false)
@ -458,10 +458,10 @@ class NettyRemoteSupport(_app: ActorSystem) extends RemoteSupport(_app) with Rem
}
class NettyRemoteServer(val remoteSupport: NettyRemoteSupport, val loader: Option[ClassLoader]) {
val log = Logging(remoteSupport.app, this)
val log = Logging(remoteSupport.system, this)
import remoteSupport.serverSettings._
val address = remoteSupport.app.rootPath.remoteAddress
val address = remoteSupport.system.rootPath.remoteAddress
val name = "NettyRemoteServer@" + address
@ -563,7 +563,7 @@ class RemoteServerHandler(
val applicationLoader: Option[ClassLoader],
val remoteSupport: NettyRemoteSupport) extends SimpleChannelUpstreamHandler {
val log = Logging(remoteSupport.app, this)
val log = Logging(remoteSupport.system, this)
import remoteSupport.serverSettings._