restructure remoting
- remove Remote, incorporate its few fields into RemoteActorRefProvider - rename RemoteSupport to RemoteTransport to sync up with conf and the way we talk about it - remove LocalAddress/RemoteAddress etc. and just have a final case class Address(protocol, system, host, port) - split netty settings out or RemoteSettings into NettySettings - split out from NettyRemoteSupport.scala: Server.scala, Client.scala, Settings.scala plus a few fixes, including using the contextClassLoader when loading the provider for ActorSystemImpl
This commit is contained in:
parent
6db3e59ce1
commit
edceda8edf
34 changed files with 1415 additions and 1520 deletions
|
|
@ -1,6 +1,10 @@
|
|||
/**
|
||||
* Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
|
||||
*/
|
||||
package akka.remote
|
||||
|
||||
import akka.testkit.AkkaSpec
|
||||
import akka.util.duration._
|
||||
|
||||
@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
|
||||
class RemoteConfigSpec extends AkkaSpec("") {
|
||||
|
|
@ -8,54 +12,20 @@ class RemoteConfigSpec extends AkkaSpec("") {
|
|||
"RemoteExtension" must {
|
||||
"be able to parse remote and cluster config elements" in {
|
||||
|
||||
val config = system.settings.config
|
||||
import config._
|
||||
val settings = new RemoteSettings(system.settings.config, "")
|
||||
import settings._
|
||||
|
||||
//akka.remote
|
||||
getString("akka.remote.transport") must equal("akka.remote.netty.NettyRemoteSupport")
|
||||
getString("akka.remote.secure-cookie") must equal("")
|
||||
getBoolean("akka.remote.use-passive-connections") must equal(true)
|
||||
getMilliseconds("akka.remote.backoff-timeout") must equal(0)
|
||||
getBoolean("akka.remote.daemonic") must equal(true)
|
||||
// getMilliseconds("akka.remote.remote-daemon-ack-timeout") must equal(30 * 1000)
|
||||
RemoteTransport must be("akka.remote.netty.NettyRemoteTransport")
|
||||
UntrustedMode must be(false)
|
||||
RemoteSystemDaemonAckTimeout must be(30 seconds)
|
||||
|
||||
//akka.remote.server
|
||||
getInt("akka.remote.server.port") must equal(2552)
|
||||
getBytes("akka.remote.server.message-frame-size") must equal(1048576L)
|
||||
getMilliseconds("akka.remote.server.connection-timeout") must equal(120 * 1000)
|
||||
getBoolean("akka.remote.server.require-cookie") must equal(false)
|
||||
getBoolean("akka.remote.server.untrusted-mode") must equal(false)
|
||||
getInt("akka.remote.server.backlog") must equal(4096)
|
||||
FailureDetectorThreshold must be(8)
|
||||
FailureDetectorMaxSampleSize must be(1000)
|
||||
|
||||
getMilliseconds("akka.remote.server.execution-pool-keepalive") must equal(60 * 1000)
|
||||
InitialDelayForGossip must be(5 seconds)
|
||||
GossipFrequency must be(1 second)
|
||||
SeedNodes must be(Set())
|
||||
|
||||
getInt("akka.remote.server.execution-pool-size") must equal(4)
|
||||
|
||||
getBytes("akka.remote.server.max-channel-memory-size") must equal(0)
|
||||
getBytes("akka.remote.server.max-total-memory-size") must equal(0)
|
||||
|
||||
//akka.remote.client
|
||||
getMilliseconds("akka.remote.client.reconnect-delay") must equal(5 * 1000)
|
||||
getMilliseconds("akka.remote.client.read-timeout") must equal(3600 * 1000)
|
||||
getMilliseconds("akka.remote.client.reconnection-time-window") must equal(600 * 1000)
|
||||
|
||||
// TODO cluster config will go into akka-cluster/reference.conf when we enable that module
|
||||
//akka.cluster
|
||||
getStringList("akka.cluster.seed-nodes") must equal(new java.util.ArrayList[String])
|
||||
|
||||
// getMilliseconds("akka.cluster.max-time-to-wait-until-connected") must equal(30 * 1000)
|
||||
// getMilliseconds("akka.cluster.session-timeout") must equal(60 * 1000)
|
||||
// getMilliseconds("akka.cluster.connection-timeout") must equal(60 * 1000)
|
||||
// getBoolean("akka.cluster.include-ref-node-in-replica-set") must equal(true)
|
||||
// getString("akka.cluster.log-directory") must equal("_akka_cluster")
|
||||
|
||||
// //akka.cluster.replication
|
||||
// getString("akka.cluster.replication.digest-type") must equal("MAC")
|
||||
// getString("akka.cluster.replication.password") must equal("secret")
|
||||
// getInt("akka.cluster.replication.ensemble-size") must equal(3)
|
||||
// getInt("akka.cluster.replication.quorum-size") must equal(2)
|
||||
// getInt("akka.cluster.replication.snapshot-frequency") must equal(1000)
|
||||
// getMilliseconds("akka.cluster.replication.timeout") must equal(30 * 1000)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue