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

Merge pull request #26037 from chbatey/log-frame-size-exceeding-broken

Browse source 
Parse akka.remote.log-frame-size-exceeding as bytes
This commit is contained in:
Patrik Nordwall 2018-12-04 12:20:26 +01:00 • committed by GitHub
commit 2f76b1a074
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-remote/src/main/scala/akka/remote/RemoteSettings.scala
View file

@ -28,7 +28,7 @@ final class RemoteSettings(val config: Config) {
val LogFrameSizeExceeding: Option[Int] = { val LogFrameSizeExceeding: Option[Int] = {
if (config.getString("akka.remote.log-frame-size-exceeding").toLowerCase == "off") None if (config.getString("akka.remote.log-frame-size-exceeding").toLowerCase == "off") None
else Some(getInt("akka.remote.log-frame-size-exceeding")) else Some(getBytes("akka.remote.log-frame-size-exceeding").toInt)
} }
val UntrustedMode: Boolean = getBoolean("akka.remote.untrusted-mode") val UntrustedMode: Boolean = getBoolean("akka.remote.untrusted-mode")

22
akka-remote/src/test/scala/akka/remote/RemoteSettingsSpec.scala Normal file
View file

@ -0,0 +1,22 @@
/*
* Copyright (C) 2018 Lightbend Inc. <https://www.lightbend.com>
*/
package akka.remote
import com.typesafe.config.ConfigFactory
import org.scalatest.{ Matchers, WordSpec }
class RemoteSettingsSpec extends WordSpec with Matchers {
"Remote settings" must {
"default akka.remote.log-frame-size-exceeding to off" in {
new RemoteSettings(ConfigFactory.load()).LogFrameSizeExceeding shouldEqual None
}
"parse akka.remote.log-frame-size-exceeding value as bytes" in {
new RemoteSettings(ConfigFactory.parseString("akka.remote.log-frame-size-exceeding = 100b").withFallback(ConfigFactory.load())).LogFrameSizeExceeding shouldEqual Some(100)
}
}
}