From 7da2341bedac63debc8830c86829fff5ec6edac4 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Mon, 29 Aug 2011 14:41:46 +0200 Subject: [PATCH] Use slf4j logger from the incoming instance.getClass.getName. Fixes #1121 * Different logger based on incoming event. * Removed format, since that should be in logback configuration. * The stackTrace is now logged with the error(msg, throwable) method. --- .../main/scala/akka/event/slf4j/SLF4J.scala | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/akka-slf4j/src/main/scala/akka/event/slf4j/SLF4J.scala b/akka-slf4j/src/main/scala/akka/event/slf4j/SLF4J.scala index 9fbad02959..b75f636e5f 100644 --- a/akka-slf4j/src/main/scala/akka/event/slf4j/SLF4J.scala +++ b/akka-slf4j/src/main/scala/akka/event/slf4j/SLF4J.scala @@ -35,22 +35,14 @@ class Slf4jEventHandler extends Actor with Logging { import EventHandler._ def receive = { - case event @ Error(cause, instance, message) ⇒ - log.error("[{}] [{}] [{}] [{}]", - Array[AnyRef](event.thread.getName, instance.getClass.getName, message.asInstanceOf[AnyRef], stackTraceFor(cause))) - - case event @ Warning(instance, message) ⇒ - log.warn("[{}] [{}] [{}]", - Array[AnyRef](event.thread.getName, instance.getClass.getName, message.asInstanceOf[AnyRef])) - - case event @ Info(instance, message) ⇒ - log.info("[{}] [{}] [{}]", - Array[AnyRef](event.thread.getName, instance.getClass.getName, message.asInstanceOf[AnyRef])) - - case event @ Debug(instance, message) ⇒ - log.debug("[{}] [{}] [{}]", - Array[AnyRef](event.thread.getName, instance.getClass.getName, message.asInstanceOf[AnyRef])) - + case Error(cause, instance, message) ⇒ + Logger(instance.getClass.getName).error(String.valueOf(message), cause) + case Warning(instance, message) ⇒ + Logger(instance.getClass.getName).warn(String.valueOf(message)) + case Info(instance, message) ⇒ + Logger(instance.getClass.getName).info(String.valueOf(message)) + case Debug(instance, message) ⇒ + Logger(instance.getClass.getName).debug(String.valueOf(message)) case event ⇒ log.debug("[{}]", event.toString) } }