move RemoteServerStarted message to NettyRemoteTransport, fixes #1771

- also make port=0 (auto) for two remote tests (config&deployer)
- also fix remote-sample conf files to configure “netty” section
This commit is contained in:
Roland 2012-02-02 11:46:52 +01:00
parent d43d41d100
commit d8fa7578e1
6 changed files with 11 additions and 11 deletions

View file

@ -23,7 +23,7 @@ import akka.actor.{ Address, ActorSystemImpl, ActorRef }
import akka.dispatch.MonitorableThreadFactory
import akka.event.Logging
import akka.remote.RemoteProtocol.AkkaRemoteProtocol
import akka.remote.{ RemoteTransportException, RemoteTransport, RemoteSettings, RemoteMarshallingOps, RemoteActorRefProvider, RemoteActorRef }
import akka.remote.{ RemoteTransportException, RemoteTransport, RemoteSettings, RemoteMarshallingOps, RemoteActorRefProvider, RemoteActorRef, RemoteServerStarted }
/**
* Provides the implementation of the Netty remote support
@ -73,6 +73,7 @@ class NettyRemoteTransport(val remoteSettings: RemoteSettings, val system: Actor
def start(): Unit = {
server.start()
setAddressFromChannel(server.channel)
notifyListeners(RemoteServerStarted(this))
}
def shutdown(): Unit = {

View file

@ -15,7 +15,7 @@ import org.jboss.netty.handler.codec.frame.{ LengthFieldPrepender, LengthFieldBa
import org.jboss.netty.handler.execution.ExecutionHandler
import akka.event.Logging
import akka.remote.RemoteProtocol.{ RemoteControlProtocol, CommandType, AkkaRemoteProtocol }
import akka.remote.{ RemoteServerStarted, RemoteServerShutdown, RemoteServerError, RemoteServerClientDisconnected, RemoteServerClientConnected, RemoteServerClientClosed, RemoteProtocol, RemoteMessage }
import akka.remote.{ RemoteServerShutdown, RemoteServerError, RemoteServerClientDisconnected, RemoteServerClientConnected, RemoteServerClientClosed, RemoteProtocol, RemoteMessage }
import akka.actor.Address
import java.net.InetAddress
import akka.actor.ActorSystemImpl
@ -53,7 +53,6 @@ class NettyRemoteServer(val netty: NettyRemoteTransport) {
def start(): Unit = {
channel = bootstrap.bind(new InetSocketAddress(ip, settings.PortSelector))
openChannels.add(channel)
netty.notifyListeners(RemoteServerStarted(netty))
}
def shutdown() {

View file

@ -13,9 +13,8 @@ import akka.remote.netty.NettyRemoteTransport
class RemoteConfigSpec extends AkkaSpec(
"""
akka {
actor {
provider = "akka.remote.RemoteActorRefProvider"
}
actor.provider = "akka.remote.RemoteActorRefProvider"
remote.netty.port = 0
}
""") {
@ -43,7 +42,7 @@ class RemoteConfigSpec extends AkkaSpec(
RequireCookie must be(false)
UsePassiveConnections must be(true)
Hostname must not be "" // will be set to the local IP
PortSelector must be(2552)
PortSelector must be(0)
MessageFrameSize must be(1048576)
ConnectionTimeout must be(2 minutes)
Backlog must be(4096)

View file

@ -18,6 +18,7 @@ object RemoteDeployerSpec {
remote = "akka://sys@wallace:2552"
}
}
akka.remote.netty.port = 0
""", ConfigParseOptions.defaults)
class RecipeActor extends Actor {

View file

@ -3,7 +3,7 @@ calculator {
include "common"
akka {
remote.server.port = 2552
remote.netty.port = 2552
}
}
//#calculator
@ -13,7 +13,7 @@ remotelookup {
include "common"
akka {
remote.server.port = 2553
remote.netty.port = 2553
}
}
//#remotelookup
@ -31,7 +31,7 @@ remotecreation {
}
}
remote.server.port = 2554
remote.netty.port = 2554
}
}
//#remotecreation

View file

@ -5,7 +5,7 @@ akka {
}
remote {
server {
netty {
hostname = "127.0.0.1"
}
}