From 570f19f6acba8d1b0e8de2a887ded2fb400318d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Endre=20S=C3=A1ndor=20Varga?= <endre.varga@drewhk.com>
Date: Thu, 27 Jun 2013 15:30:41 +0200
Subject: [PATCH] Error level remoting events are logged by default #3475

---
 .../akka/remote/RemotingLifecycleEvent.scala  |  2 +-
 .../test/scala/akka/remote/RemotingSpec.scala | 26 ++++++++++++-------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/akka-remote/src/main/scala/akka/remote/RemotingLifecycleEvent.scala b/akka-remote/src/main/scala/akka/remote/RemotingLifecycleEvent.scala
index 42c788e5d7..aec4fb2e27 100644
--- a/akka-remote/src/main/scala/akka/remote/RemotingLifecycleEvent.scala
+++ b/akka-remote/src/main/scala/akka/remote/RemotingLifecycleEvent.scala
@@ -84,6 +84,6 @@ final case class RemotingErrorEvent(cause: Throwable) extends RemotingLifecycleE
 private[remote] class EventPublisher(system: ActorSystem, log: LoggingAdapter, logEvents: Boolean) {
   def notifyListeners(message: RemotingLifecycleEvent): Unit = {
     system.eventStream.publish(message)
-    if (logEvents) log.log(message.logLevel, "{}", message)
+    if (logEvents || message.logLevel == Logging.ErrorLevel) log.log(message.logLevel, "{}", message)
   }
 }
\ No newline at end of file
diff --git a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
index afc49a7904..7c8ad93396 100644
--- a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
+++ b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
@@ -81,7 +81,7 @@ object RemotingSpec {
         transport = "akka.remote.Remoting"
 
         retry-gate-closed-for = 1 s
-        log-remote-lifecycle-events = on
+        log-remote-lifecycle-events = off
 
         enabled-transports = [
           "akka.remote.test",
@@ -474,9 +474,11 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
 
     "drop unserializable messages" in {
       object Unserializable
-      verifySend(Unserializable) {
-        expectMsgPF(1.second) {
-          case AssociationErrorEvent(_: NotSerializableException, _, _, _) ⇒ ()
+      EventFilter.error(pattern = ".*No configured serialization.*", occurrences = 1).intercept {
+        verifySend(Unserializable) {
+          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 {
       val oversized = byteStringOfSize(maxPayloadBytes + 1)
-      verifySend(oversized) {
-        expectMsgPF(1.second) {
-          case AssociationErrorEvent(e: OversizedPayloadException, _, _, _) if e.getMessage.startsWith("Discarding oversized payload sent") ⇒ ()
+      EventFilter.error(pattern = ".*Discarding oversized payload sent.*", occurrences = 1).intercept {
+        verifySend(oversized) {
+          expectMsgPF(1.second) {
+            case AssociationErrorEvent(e: OversizedPayloadException, _, _, _) if e.getMessage.startsWith("Discarding oversized payload sent") ⇒ ()
+          }
         }
       }
     }
 
     "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
-      verifySend(maxPayloadBytes + 1) {
-        expectMsgPF(1.second) {
-          case AssociationErrorEvent(e: OversizedPayloadException, _, _, _) if e.getMessage.startsWith("Discarding oversized payload received") ⇒ ()
+      EventFilter.error(pattern = ".*Discarding oversized payload received.*", occurrences = 1).intercept {
+        verifySend(maxPayloadBytes + 1) {
+          expectMsgPF(1.second) {
+            case AssociationErrorEvent(e: OversizedPayloadException, _, _, _) if e.getMessage.startsWith("Discarding oversized payload received") ⇒ ()
+          }
         }
       }
     }