diff --git a/akka-remote/src/main/scala/akka/remote/RemoteShared.scala b/akka-remote/src/main/scala/akka/remote/RemoteShared.scala index 5293b4be8e..c38bf8395a 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteShared.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteShared.scala @@ -42,6 +42,8 @@ object RemoteServerSettings { level } + val BACKLOG = config.getInt("akka.remote.server.backlog", 4096) + val SECURE = { /*if (config.getBool("akka.remote.ssl.service",false)) { val properties = List( diff --git a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala index 1f05ea7452..80ac2f08a5 100644 --- a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala +++ b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala @@ -547,6 +547,7 @@ class NettyRemoteServer(serverModule: NettyRemoteServerModule, val host: String, val pipelineFactory = new RemoteServerPipelineFactory(name, openChannels, loader, serverModule) bootstrap.setPipelineFactory(pipelineFactory) + bootstrap.setOption("backlog", RemoteServerSettings.BACKLOG) bootstrap.setOption("child.tcpNoDelay", true) bootstrap.setOption("child.keepAlive", true) bootstrap.setOption("child.reuseAddress", true) diff --git a/config/akka-reference.conf b/config/akka-reference.conf index 46b05ca1ec..4b0397571d 100644 --- a/config/akka-reference.conf +++ b/config/akka-reference.conf @@ -127,7 +127,8 @@ akka { message-frame-size = 1048576 # Increase this if you want to be able to send messages with large payloads connection-timeout = 1 require-cookie = on # Should the remote server require that it peers share the same secure-cookie (defined in the 'remote' section)? - untrusted-mode = off # Enable untrusted mode for full security of server managed actors, allows untrusted clients to connect. + untrusted-mode = off # Enable untrusted mode for full security of server managed actors, allows untrusted clients to connect. + backlog = 4096 # Sets the size of the connection backlog } client {