diff --git a/akka-remote/src/main/scala/akka/remote/RemoteMetricsExtension.scala b/akka-remote/src/main/scala/akka/remote/RemoteMetricsExtension.scala index dfe166bf11..0352705375 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteMetricsExtension.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteMetricsExtension.scala @@ -26,7 +26,7 @@ private[akka] object RemoteMetricsExtension extends ExtensionId[RemoteMetrics] w override def lookup = RemoteMetricsExtension override def createExtension(system: ExtendedActorSystem): RemoteMetrics = - if (system.settings.config.getString("akka.remote.log-frame-size-exceeding").toLowerCase == "off") + if (RARP(system).provider.remoteSettings.LogFrameSizeExceeding.isEmpty) new RemoteMetricsOff else new RemoteMetricsOn(system) @@ -56,8 +56,8 @@ private[akka] class RemoteMetricsOff extends RemoteMetrics { */ private[akka] class RemoteMetricsOn(system: ExtendedActorSystem) extends RemoteMetrics { - private val logFrameSizeExceeding: Int = system.settings.config.getBytes( - "akka.remote.log-frame-size-exceeding").toInt + private val logFrameSizeExceeding: Int = RARP(system).provider.remoteSettings.LogFrameSizeExceeding + .getOrElse(Int.MaxValue) private val log = Logging(system, this.getClass) private val maxPayloadBytes: ConcurrentHashMap[Class[_], Integer] = new ConcurrentHashMap @@ -87,4 +87,3 @@ private[akka] class RemoteMetricsOn(system: ExtendedActorSystem) extends RemoteM check() } } - diff --git a/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala b/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala index c7654f5ea3..632c8e3cff 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala @@ -26,6 +26,11 @@ final class RemoteSettings(val config: Config) { val LogSend: Boolean = getBoolean("akka.remote.log-sent-messages") + val LogFrameSizeExceeding: Option[Int] = { + if (config.getString("akka.remote.log-frame-size-exceeding").toLowerCase == "off") None + else Some(getInt("akka.remote.log-frame-size-exceeding")) + } + val UntrustedMode: Boolean = getBoolean("akka.remote.untrusted-mode") val TrustedSelectionPaths: Set[String] =