You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/08/28 12:25:00 UTC
[39/50] logging-log4j2 git commit: Scala Logger extends AnyVal
Scala Logger extends AnyVal
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/de52134d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/de52134d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/de52134d
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: de52134dbaf9e060f0dde4e41cb1a38e3040cfed
Parents: bcc14d1
Author: Mikael St�ldal <mi...@magine.com>
Authored: Tue Jul 26 18:39:38 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Tue Jul 26 18:39:38 2016 +0200
----------------------------------------------------------------------
.../org/apache/logging/log4j/scala/Logger.scala | 16 +++++++---------
.../org/apache/logging/log4j/scala/Logger.scala | 16 +++++++---------
2 files changed, 14 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de52134d/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 4ad20e1..b42cd5a 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
@@ -29,7 +29,9 @@ import scala.language.experimental.macros
*/
object Logger {
- /**
+ final val FQCN = getClass.getName
+
+ /**
* Create a properly named [[Logger]] for a given class.
*
* @param clazz the class
@@ -60,11 +62,7 @@ object Logger {
* Since this wrapper is implemented with macros, the String construction and method invocations
* will only occur when debug logging is enabled.
*/
-class Logger private(val delegate: ExtendedLogger) {
- // TODO extends AnyVal ?
-
- private final val FQCN = classOf[Logger].getName
-
+class Logger private(val delegate: ExtendedLogger) extends AnyVal {
def fatal(marker: Marker, message: Message): Unit =
macro LoggerMacro.fatalMarkerMsg
@@ -560,7 +558,7 @@ class Logger private(val delegate: ExtendedLogger) {
* @param cause cause or `null`
*/
def logMessage(level: Level, marker: Marker, message: Message, cause: Throwable): Unit = {
- delegate.logMessage(FQCN, level, marker, message, cause)
+ delegate.logMessage(Logger.FQCN, level, marker, message, cause)
}
/** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified
@@ -574,7 +572,7 @@ class Logger private(val delegate: ExtendedLogger) {
* @param cause cause or `null`
*/
def logMessage(level: Level, marker: Marker, message: CharSequence, cause: Throwable): Unit = {
- delegate.logMessage(FQCN, level, marker, delegate.getMessageFactory.asInstanceOf[MessageFactory2].newMessage(message), cause)
+ delegate.logMessage(Logger.FQCN, level, marker, delegate.getMessageFactory.asInstanceOf[MessageFactory2].newMessage(message), cause)
}
/** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified
@@ -588,7 +586,7 @@ class Logger private(val delegate: ExtendedLogger) {
* @param cause cause or `null`
*/
def logMessage(level: Level, marker: Marker, message: AnyRef, cause: Throwable): Unit = {
- delegate.logMessage(FQCN, level, marker, delegate.getMessageFactory.asInstanceOf[MessageFactory2].newMessage(message), cause)
+ delegate.logMessage(Logger.FQCN, level, marker, delegate.getMessageFactory.asInstanceOf[MessageFactory2].newMessage(message), cause)
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/de52134d/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 4ad20e1..b42cd5a 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
@@ -29,7 +29,9 @@ import scala.language.experimental.macros
*/
object Logger {
- /**
+ final val FQCN = getClass.getName
+
+ /**
* Create a properly named [[Logger]] for a given class.
*
* @param clazz the class
@@ -60,11 +62,7 @@ object Logger {
* Since this wrapper is implemented with macros, the String construction and method invocations
* will only occur when debug logging is enabled.
*/
-class Logger private(val delegate: ExtendedLogger) {
- // TODO extends AnyVal ?
-
- private final val FQCN = classOf[Logger].getName
-
+class Logger private(val delegate: ExtendedLogger) extends AnyVal {
def fatal(marker: Marker, message: Message): Unit =
macro LoggerMacro.fatalMarkerMsg
@@ -560,7 +558,7 @@ class Logger private(val delegate: ExtendedLogger) {
* @param cause cause or `null`
*/
def logMessage(level: Level, marker: Marker, message: Message, cause: Throwable): Unit = {
- delegate.logMessage(FQCN, level, marker, message, cause)
+ delegate.logMessage(Logger.FQCN, level, marker, message, cause)
}
/** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified
@@ -574,7 +572,7 @@ class Logger private(val delegate: ExtendedLogger) {
* @param cause cause or `null`
*/
def logMessage(level: Level, marker: Marker, message: CharSequence, cause: Throwable): Unit = {
- delegate.logMessage(FQCN, level, marker, delegate.getMessageFactory.asInstanceOf[MessageFactory2].newMessage(message), cause)
+ delegate.logMessage(Logger.FQCN, level, marker, delegate.getMessageFactory.asInstanceOf[MessageFactory2].newMessage(message), cause)
}
/** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified
@@ -588,7 +586,7 @@ class Logger private(val delegate: ExtendedLogger) {
* @param cause cause or `null`
*/
def logMessage(level: Level, marker: Marker, message: AnyRef, cause: Throwable): Unit = {
- delegate.logMessage(FQCN, level, marker, delegate.getMessageFactory.asInstanceOf[MessageFactory2].newMessage(message), cause)
+ delegate.logMessage(Logger.FQCN, level, marker, delegate.getMessageFactory.asInstanceOf[MessageFactory2].newMessage(message), cause)
}
}