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

Merge branch 'master' of github.com:jboner/akka

Browse source
This commit is contained in:
Viktor Klang 2011-07-20 12:52:59 +02:00
commit 4258abfc9f
6 changed files with 61 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

59
akka-actor-tests/src/test/scala/akka/actor/actor/ClusterSpec.scala Normal file
View file

@ -0,0 +1,59 @@
package akka.actor.actor
import org.scalatest.WordSpec
import org.scalatest.matchers.MustMatchers
import akka.config.Config
class ClusterSpec extends WordSpec with MustMatchers {
"A Deployer" must {
"be able to parse 'akka.actor.cluster._' config elements" in {
import Config.config._
//akka.cluster
getString("akka.cluster.name") must equal(Some("test-cluster"))
getString("akka.cluster.zookeeper-server-addresses") must equal(Some("localhost:2181"))
getInt("akka.cluster.server.port") must equal(Some(2552))
getInt("akka.cluster.max-time-to-wait-until-connected") must equal(Some(30))
getInt("akka.cluster.session-timeout") must equal(Some(60))
getInt("akka.cluster.connection-timeout") must equal(Some(60))
getBool("akka.cluster.use-compression") must equal(Some(false))
getInt("akka.cluster.connection-timeout") must equal(Some(60))
getInt("akka.cluster.remote-daemon-ack-timeout") must equal(Some(30))
getBool("akka.cluster.include-ref-node-in-replica-set") must equal(Some(true))
getString("akka.cluster.compression-scheme") must equal(Some("zlib"))
getInt("akka.cluster.zlib-compression-level") must equal(Some(6))
getString("akka.cluster.layer") must equal(Some("akka.remote.netty.NettyRemoteSupport"))
getString("akka.cluster.secure-cookie") must equal(Some(""))
getString("akka.cluster.log-directory") must equal(Some("_akka_cluster"))
//akka.cluster.replication
getString("akka.cluster.replication.digest-type") must equal(Some("MAC"))
getString("akka.cluster.replication.password") must equal(Some("secret"))
getInt("akka.cluster.replication.ensemble-size") must equal(Some(3))
getInt("akka.cluster.replication.quorum-size") must equal(Some(2))
getInt("akka.cluster.replication.snapshot-frequency") must equal(Some(1000))
getInt("akka.cluster.replication.timeout") must equal(Some(30))
//akka.cluster.server
getInt("akka.cluster.server.port") must equal(Some(2552))
getInt("akka.cluster.server.message-frame-size") must equal(Some(1048576))
getInt("akka.cluster.server.connection-timeout") must equal(Some(1))
getBool("akka.cluster.server.require-cookie") must equal(Some(false))
getBool("akka.cluster.server.untrusted-mode") must equal(Some(false))
getInt("akka.cluster.server.backlog") must equal(Some(4096))
getInt("akka.cluster.server.execution-pool-keepalive") must equal(Some(60))
getInt("akka.cluster.server.execution-pool-size") must equal(Some(16))
getInt("akka.cluster.server.max-channel-memory-size") must equal(Some(0))
getInt("akka.cluster.server.max-total-memory-size") must equal(Some(0))
//akka.cluster.client
getBool("akka.cluster.client.buffering.retry-message-send-on-failure") must equal(Some(true))
getInt("akka.cluster.client.buffering.capacity") must equal(Some(-1))
getInt("akka.cluster.client.reconnect-delay") must equal(Some(5))
getInt("akka.cluster.client.read-timeout") must equal(Some(10))
getInt("akka.cluster.client.reap-futures-delay") must equal(Some(5))
getInt("akka.cluster.client.reconnection-time-window") must equal(Some(600))
}
}
}

1
akka-actor-tests/src/test/scala/akka/actor/actor/DeployerSpec.scala
View file

@ -14,6 +14,7 @@ class DeployerSpec extends WordSpec with MustMatchers {
"be able to parse 'akka.actor.deployment._' config elements" in {
val deployment = Deployer.lookupInConfig("service-ping")
deployment must be('defined)
deployment must equal(Some(
Deploy(
"service-ping",

1
akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala
View file

@ -36,7 +36,6 @@ class ConfigSpec extends WordSpec with MustMatchers {
getInt("akka.actor.timeout") must equal(Some(5))
getInt("akka.actor.throughput") must equal(Some(5))
getInt("akka.actor.throughput-deadline-time") must equal(Some(-1))
getInt("akka.actor.deployment.service-ping.clustered.replication-factor") must equal(Some(3))
getString("akka.cluster.layer") must equal(Some("akka.remote.netty.NettyRemoteSupport"))
getInt("akka.cluster.server.port") must equal(Some(2552))

2
akka-actor/src/main/scala/akka/actor/Deployer.scala
View file

@ -11,9 +11,7 @@ import java.util.concurrent.ConcurrentHashMap
import akka.event.EventHandler
import akka.actor.DeploymentConfig._
import akka.config.{ ConfigurationException, Config }
import akka.routing.RouterType
import akka.util.ReflectiveAccess._
import akka.serialization._
import akka.AkkaException
/**

1
akka-actor/src/main/scala/akka/actor/DeploymentConfig.scala
View file

@ -6,7 +6,6 @@ package akka.actor
import akka.config.Config
import akka.routing.RouterType
import akka.serialization.Serializer
/**
* Module holding the programmatic deployment configuration classes.

19
project/AkkaBuild.scala
View file

@ -275,24 +275,7 @@ object AkkaBuild extends Build {
override lazy val settings = super.settings ++ buildSettings ++ Publish.versionSettings
lazy val baseSettings = Defaults.defaultSettings ++ Publish.settings ++ Seq(
sourceFileEncoding := "UTF-8",
alignSingleLineCaseStatementsMaxArrowIndent := 2000,
alignParameters := true,
alignSingleLineCaseStatements := true,
compactStringConcatenation := false,
indentPackageBlocks := true,
formatXml := true,
preserveSpaceBeforeArguments := true,
doubleIndentClassDeclaration := false,
rewriteArrowSymbols := true,
spaceInsideBrackets := false,
spaceInsideParentheses := false,
spaceBeforeColon:= false,
preserveDanglingCloseParenthesis := false,
indentSpaces := 2,
indentLocalDefs := false
) ++ formatterTasks
lazy val baseSettings = Defaults.defaultSettings ++ Publish.settings ++ formatterPreferences ++ formatterTasks
lazy val parentSettings = baseSettings ++ Seq(
publishArtifact in Compile := false