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

format source with scalafmt, #26511

Browse source
This commit is contained in:
Auto Format 2019-03-13 10:56:20 +01:00 • committed by Patrik Nordwall
parent 2ba9b988df
commit 75579bed17
779 changed files with 15729 additions and 13096 deletions
Download patch file Download diff file Expand all files Collapse all files

14
akka-slf4j/src/main/scala/akka/event/slf4j/Slf4jLogger.scala
View file

@ -67,9 +67,10 @@ class Slf4jLogger extends Actor with SLF4JLogging with RequiresMessageQueue[Logg
case Error.NoCause | null =>
Logger(logClass, logSource).error(markerIfPresent(event), if (message != null) message.toString else null)
case _ =>
Logger(logClass, logSource).error(markerIfPresent(event),
if (message != null) message.toString else cause.getLocalizedMessage,
cause)
Logger(logClass, logSource).error(
markerIfPresent(event),
if (message != null) message.toString else cause.getLocalizedMessage,
cause)
}
}
@ -77,9 +78,10 @@ class Slf4jLogger extends Actor with SLF4JLogging with RequiresMessageQueue[Logg
withMdc(logSource, event) {
event match {
case e: LogEventWithCause =>
Logger(logClass, logSource).warn(markerIfPresent(event),
if (message != null) message.toString else e.cause.getLocalizedMessage,
e.cause)
Logger(logClass, logSource).warn(
markerIfPresent(event),
if (message != null) message.toString else e.cause.getLocalizedMessage,
e.cause)
case _ =>
Logger(logClass, logSource).warn(markerIfPresent(event), if (message != null) message.toString else null)
}

12
akka-slf4j/src/test/scala/akka/event/slf4j/Slf4jLoggerSpec.scala
View file

@ -133,9 +133,10 @@ class Slf4jLoggerSpec extends AkkaSpec(Slf4jLoggerSpec.config) with BeforeAndAft
"log info with slf4j marker and MDC" in {
val slf4jMarker = MarkerFactory.getMarker("SLF")
slf4jMarker.add(MarkerFactory.getMarker("ADDED")) // slf4j markers can have children
producer ! StringWithSlf4jMarkerMDC("security-wise interesting message",
slf4jMarker,
Map("ticketNumber" -> 3671, "ticketDesc" -> "Custom MDC Values"))
producer ! StringWithSlf4jMarkerMDC(
"security-wise interesting message",
slf4jMarker,
Map("ticketNumber" -> 3671, "ticketDesc" -> "Custom MDC Values"))
awaitCond(outputString.contains("----"), 5 seconds)
val s = outputString
@ -145,8 +146,9 @@ class Slf4jLoggerSpec extends AkkaSpec(Slf4jLoggerSpec.config) with BeforeAndAft
}
"put custom MDC values when specified" in {
producer ! StringWithMDC("Message with custom MDC values",
Map("ticketNumber" -> 3671, "ticketDesc" -> "Custom MDC Values"))
producer ! StringWithMDC(
"Message with custom MDC values",
Map("ticketNumber" -> 3671, "ticketDesc" -> "Custom MDC Values"))
awaitCond(outputString.contains("----"), 5 seconds)
val s = outputString