Make artery the default remoting (#26772)

This commit is contained in:
Christopher Batey 2019-05-01 08:12:09 +01:00 committed by GitHub
parent ac91c797a5
commit efc3adc08d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
158 changed files with 977 additions and 999 deletions

View file

@ -14,7 +14,7 @@ object ClusterDocSpec {
val config =
"""
akka.actor.provider = "cluster"
akka.remote.netty.tcp.port = 0
akka.remote.classic.netty.tcp.port = 0
"""
}

View file

@ -43,7 +43,7 @@ object FactorialBackend {
// Override the configuration of the port when specified as program argument
val port = if (args.isEmpty) "0" else args(0)
val config = ConfigFactory
.parseString(s"akka.remote.netty.tcp.port=$port")
.parseString(s"akka.remote.classic.netty.tcp.port=$port")
.withFallback(ConfigFactory.parseString("akka.cluster.roles = [backend]"))
.withFallback(ConfigFactory.load("factorial"))

View file

@ -47,7 +47,7 @@ object TransformationBackend {
// Override the configuration of the port when specified as program argument
val port = if (args.isEmpty) "0" else args(0)
val config = ConfigFactory
.parseString(s"akka.remote.netty.tcp.port=$port")
.parseString(s"akka.remote.classic.netty.tcp.port=$port")
.withFallback(ConfigFactory.parseString("akka.cluster.roles = [backend]"))
.withFallback(ConfigFactory.load())

View file

@ -46,7 +46,7 @@ object TransformationFrontend {
// Override the configuration of the port when specified as program argument
val port = if (args.isEmpty) "0" else args(0)
val config = ConfigFactory
.parseString(s"akka.remote.netty.tcp.port=$port")
.parseString(s"akka.remote.classic.netty.tcp.port=$port")
.withFallback(ConfigFactory.parseString("akka.cluster.roles = [frontend]"))
.withFallback(ConfigFactory.load())

View file

@ -19,7 +19,7 @@ object DistributedDataDocSpec {
val config =
"""
akka.actor.provider = "cluster"
akka.remote.netty.tcp.port = 0
akka.remote.classic.netty.tcp.port = 0
#//#serializer-config
akka.actor {

View file

@ -21,9 +21,8 @@ object RemoteDeploymentDocSpec {
class RemoteDeploymentDocSpec extends AkkaSpec("""
akka.actor.provider = remote
akka.remote.netty.tcp {
port = 0
}
akka.remote.classic.netty.tcp.port = 0
akka.remote.artery.canonical.port = 0
""") with ImplicitSender {
import RemoteDeploymentDocSpec._