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

changed order of config elements

Browse source
This commit is contained in:
Jonas Bonér 2009-12-27 06:35:25 +01:00
parent 0ab13d5821
commit be00b09f75
2 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

30
akka-core/src/main/scala/remote/RemoteServer.scala
View file

@ -105,20 +105,22 @@ class RemoteServer extends Logging {
def start(_hostname: String, _port: Int): Unit = start(_hostname, _port, None) def start(_hostname: String, _port: Int): Unit = start(_hostname, _port, None)
def start(_hostname: String, _port: Int, loader: Option[ClassLoader]): Unit = synchronized { def start(_hostname: String, _port: Int, loader: Option[ClassLoader]): Unit = synchronized {
if (!isRunning) { try {
hostname = _hostname if (!isRunning) {
port = _port hostname = _hostname
log.info("Starting remote server at [%s:%s]", hostname, port) port = _port
bootstrap.setPipelineFactory(new RemoteServerPipelineFactory(name, openChannels, loader)) log.info("Starting remote server at [%s:%s]", hostname, port)
bootstrap.setPipelineFactory(new RemoteServerPipelineFactory(name, openChannels, loader))
// FIXME make these RemoteServer options configurable bootstrap.setOption("child.tcpNoDelay", true)
bootstrap.setOption("child.tcpNoDelay", true) bootstrap.setOption("child.keepAlive", true)
bootstrap.setOption("child.keepAlive", true) bootstrap.setOption("child.reuseAddress", true)
bootstrap.setOption("child.reuseAddress", true) bootstrap.setOption("child.connectTimeoutMillis", RemoteServer.CONNECTION_TIMEOUT_MILLIS)
bootstrap.setOption("child.connectTimeoutMillis", RemoteServer.CONNECTION_TIMEOUT_MILLIS) openChannels.add(bootstrap.bind(new InetSocketAddress(hostname, port)))
openChannels.add(bootstrap.bind(new InetSocketAddress(hostname, port))) isRunning = true
isRunning = true Cluster.registerLocalNode(hostname,port)
Cluster.registerLocalNode(hostname,port) }
} catch {
case e => log.error(e, "Could not start up remote server")
} }
} }

16
config/akka-reference.conf
View file

@ -34,6 +34,14 @@
distributed = off # not implemented yet distributed = off # not implemented yet
</stm> </stm>
<rest>
service = on
hostname = "localhost"
port = 9998
filters = "[se.scalablesolutions.akka.security.AkkaSecurityFilterFactory]" # List with all jersey filters to use
authenticator = "se.scalablesolutions.akka.security.samples.BasicAuthenticationService" # The authentication service to use
</rest>
<remote> <remote>
compression-scheme = "zlib" # Options: "zlib" (lzf to come), leave out for no compression compression-scheme = "zlib" # Options: "zlib" (lzf to come), leave out for no compression
zlib-compression-level = 6 # Options: 0-9 (1 being fastest and 9 being the most compressed), default is 6 zlib-compression-level = 6 # Options: 0-9 (1 being fastest and 9 being the most compressed), default is 6
@ -57,14 +65,6 @@
<client> <client>
</remote> </remote>
<rest>
service = on
hostname = "localhost"
port = 9998
filters = "[se.scalablesolutions.akka.security.AkkaSecurityFilterFactory]" # List with all jersey filters to use
authenticator = "se.scalablesolutions.akka.security.samples.BasicAuthenticationService" # The authentication service to use
</rest>
<storage> <storage>
<cassandra> <cassandra>
hostname = "127.0.0.1" # IP address or hostname of one of the Cassandra cluster's seeds hostname = "127.0.0.1" # IP address or hostname of one of the Cassandra cluster's seeds