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

Error level remoting events are logged by default #3475

Browse source
This commit is contained in:
Endre Sándor Varga 2013-06-27 15:30:41 +02:00
parent a33ebb969f
commit 570f19f6ac
2 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -84,6 +84,6 @@ final case class RemotingErrorEvent(cause: Throwable) extends RemotingLifecycleE
private[remote] class EventPublisher(system: ActorSystem, log: LoggingAdapter, logEvents: Boolean) { private[remote] class EventPublisher(system: ActorSystem, log: LoggingAdapter, logEvents: Boolean) {
def notifyListeners(message: RemotingLifecycleEvent): Unit = { def notifyListeners(message: RemotingLifecycleEvent): Unit = {
system.eventStream.publish(message) system.eventStream.publish(message)
if (logEvents) log.log(message.logLevel, "{}", message) if (logEvents || message.logLevel == Logging.ErrorLevel) log.log(message.logLevel, "{}", message)
} }
} }

26
akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
View file

@ -81,7 +81,7 @@ object RemotingSpec {
transport = "akka.remote.Remoting" transport = "akka.remote.Remoting"
retry-gate-closed-for = 1 s retry-gate-closed-for = 1 s
log-remote-lifecycle-events = on log-remote-lifecycle-events = off
enabled-transports = [ enabled-transports = [
"akka.remote.test", "akka.remote.test",
@ -474,9 +474,11 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
"drop unserializable messages" in { "drop unserializable messages" in {
object Unserializable object Unserializable
verifySend(Unserializable) { EventFilter.error(pattern = ".*No configured serialization.*", occurrences = 1).intercept {
expectMsgPF(1.second) { verifySend(Unserializable) {
case AssociationErrorEvent(_: NotSerializableException, _, _, _) ⇒ () expectMsgPF(1.second) {
case AssociationErrorEvent(_: NotSerializableException, _, _, _) ⇒ ()
}
} }
} }
} }
@ -491,18 +493,22 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
"drop sent messages over payload size" in { "drop sent messages over payload size" in {
val oversized = byteStringOfSize(maxPayloadBytes + 1) val oversized = byteStringOfSize(maxPayloadBytes + 1)
verifySend(oversized) { EventFilter.error(pattern = ".*Discarding oversized payload sent.*", occurrences = 1).intercept {
expectMsgPF(1.second) { verifySend(oversized) {
case AssociationErrorEvent(e: OversizedPayloadException, _, _, _) if e.getMessage.startsWith("Discarding oversized payload sent") ⇒ () expectMsgPF(1.second) {
case AssociationErrorEvent(e: OversizedPayloadException, _, _, _) if e.getMessage.startsWith("Discarding oversized payload sent") ⇒ ()
}
} }
} }
} }
"drop received messages over payload size" in { "drop received messages over payload size" in {
// Receiver should reply with a message of size maxPayload + 1, which will be dropped and an error logged // Receiver should reply with a message of size maxPayload + 1, which will be dropped and an error logged
verifySend(maxPayloadBytes + 1) { EventFilter.error(pattern = ".*Discarding oversized payload received.*", occurrences = 1).intercept {
expectMsgPF(1.second) { verifySend(maxPayloadBytes + 1) {
case AssociationErrorEvent(e: OversizedPayloadException, _, _, _) if e.getMessage.startsWith("Discarding oversized payload received") ⇒ () expectMsgPF(1.second) {
case AssociationErrorEvent(e: OversizedPayloadException, _, _, _) if e.getMessage.startsWith("Discarding oversized payload received") ⇒ ()
}
} }
} }
} }