Repository: logging-log4j2 Updated Branches: refs/heads/LOG4J-1181 95c725f18 -> 443251b13
Fix flow logging Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/443251b1 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/443251b1 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/443251b1 Branch: refs/heads/LOG4J-1181 Commit: 443251b13046b90c6d348e785c7241c993eb5aa8 Parents: 95c725f Author: Mikael Ståldal <[email protected]> Authored: Fri Jun 17 21:27:33 2016 +0200 Committer: Mikael Ståldal <[email protected]> Committed: Fri Jun 17 21:27:33 2016 +0200 ---------------------------------------------------------------------- .../scala/org/apache/logging/log4j/scala/Logger.scala | 14 ++++++++++---- .../scala/org/apache/logging/log4j/scala/Logger.scala | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/443251b1/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/Logger.scala ---------------------------------------------------------------------- diff --git a/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/Logger.scala b/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/Logger.scala index 8ebdee4..f8c4f51 100644 --- a/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/Logger.scala +++ b/log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/Logger.scala @@ -16,7 +16,7 @@ */ package org.apache.logging.log4j.scala -import org.apache.logging.log4j.message.{Message, MessageFactory2} +import org.apache.logging.log4j.message.{EntryMessage, Message, MessageFactory2} import org.apache.logging.log4j.spi.ExtendedLogger import org.apache.logging.log4j.{Level, Marker} @@ -290,15 +290,20 @@ class Logger(val delegate: ExtendedLogger) { def isEnabled(level: Level, marker: Marker): Boolean = delegate.isEnabled(level, marker) - def entry(params: AnyRef*): Unit = - delegate.entry(params) // TODO would be useful to have this as a macro to avoid varargs array creation - def traceEntry(): Unit = delegate.traceEntry() + def traceEntry(): EntryMessage = delegate.traceEntry() + + def traceEntry(params: AnyRef*): EntryMessage = + delegate.traceEntry(null, params) // TODO would be useful to have this as a macro to avoid varargs array creation + + def traceEntry(message: Message): EntryMessage = delegate.traceEntry(message) def traceExit[R](result: R): R = delegate.traceExit(result) def traceExit(): Unit = delegate.traceExit() + def traceExit(entryMessage: EntryMessage): Unit = delegate.traceExit(entryMessage) + def throwing[T <: Throwable](t: T): T = delegate.throwing(t) def throwing[T <: Throwable](level: Level, t: T): T = delegate.throwing(level, t) @@ -307,6 +312,7 @@ class Logger(val delegate: ExtendedLogger) { def catching(level: Level, t: Throwable): Unit = delegate.catching(level, t) + def level: Level = delegate.getLevel def name: String = delegate.getName http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/443251b1/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/Logger.scala ---------------------------------------------------------------------- diff --git a/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/Logger.scala b/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/Logger.scala index 8ebdee4..f8c4f51 100644 --- a/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/Logger.scala +++ b/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/Logger.scala @@ -16,7 +16,7 @@ */ package org.apache.logging.log4j.scala -import org.apache.logging.log4j.message.{Message, MessageFactory2} +import org.apache.logging.log4j.message.{EntryMessage, Message, MessageFactory2} import org.apache.logging.log4j.spi.ExtendedLogger import org.apache.logging.log4j.{Level, Marker} @@ -290,15 +290,20 @@ class Logger(val delegate: ExtendedLogger) { def isEnabled(level: Level, marker: Marker): Boolean = delegate.isEnabled(level, marker) - def entry(params: AnyRef*): Unit = - delegate.entry(params) // TODO would be useful to have this as a macro to avoid varargs array creation - def traceEntry(): Unit = delegate.traceEntry() + def traceEntry(): EntryMessage = delegate.traceEntry() + + def traceEntry(params: AnyRef*): EntryMessage = + delegate.traceEntry(null, params) // TODO would be useful to have this as a macro to avoid varargs array creation + + def traceEntry(message: Message): EntryMessage = delegate.traceEntry(message) def traceExit[R](result: R): R = delegate.traceExit(result) def traceExit(): Unit = delegate.traceExit() + def traceExit(entryMessage: EntryMessage): Unit = delegate.traceExit(entryMessage) + def throwing[T <: Throwable](t: T): T = delegate.throwing(t) def throwing[T <: Throwable](level: Level, t: T): T = delegate.throwing(level, t) @@ -307,6 +312,7 @@ class Logger(val delegate: ExtendedLogger) { def catching(level: Level, t: Throwable): Unit = delegate.catching(level, t) + def level: Level = delegate.getLevel def name: String = delegate.getName
