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:24:39 UTC
[18/50] logging-log4j2 git commit: Fix macro access
Fix macro access
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cda39288
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cda39288
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cda39288
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: cda392882186f8b3da9d1e4df339b10ffbeb57c9
Parents: 45306d8
Author: Mikael St�ldal <mi...@magine.com>
Authored: Tue Jun 28 13:54:38 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Tue Jun 28 13:54:38 2016 +0200
----------------------------------------------------------------------
.../org/apache/logging/log4j/scala/Logger.scala | 21 ++++++++++++++------
.../org/apache/logging/log4j/scala/Logger.scala | 21 ++++++++++++++------
2 files changed, 30 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cda39288/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 e57c86c..c662ef1 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
@@ -580,48 +580,57 @@ class Logger private(val delegate: ExtendedLogger) {
/** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified
* level is enabled.
*
+ * Should normally not be used directly from application code, but needs to be public for access by macros.
+ *
* @param level log level
* @param marker marker or `null`
* @param message message
* @param cause cause or `null`
*/
- private[scala] def logMessage(level: Level, marker: Marker, message: Message, cause: Throwable): Unit = {
+ def logMessage(level: Level, marker: Marker, message: Message, cause: Throwable): Unit = {
delegate.logMessage(FQCN, level, marker, message, cause)
}
/** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified
* level is enabled.
*
+ * Should normally not be used directly from application code, but needs to be public for access by macros.
+ *
* @param level log level
* @param marker marker or `null`
* @param message message
* @param cause cause or `null`
*/
- private[scala] def logMessage(level: Level, marker: Marker, message: CharSequence, cause: Throwable): Unit = {
+ def logMessage(level: Level, marker: Marker, message: CharSequence, cause: Throwable): Unit = {
delegate.logMessage(FQCN, level, marker, messageFactory.newMessage(message), cause)
}
/** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified
* level is enabled.
*
+ * Should normally not be used directly from application code, but needs to be public for access by macros.
+ *
* @param level log level
* @param marker marker or `null`
* @param message message
* @param cause cause or `null`
*/
- private[scala] def logMessage(level: Level, marker: Marker, message: AnyRef, cause: Throwable): Unit = {
+ def logMessage(level: Level, marker: Marker, message: AnyRef, cause: Throwable): Unit = {
delegate.logMessage(FQCN, level, marker, messageFactory.newMessage(message), cause)
}
- private[scala] def traceEntryParams(params: Any*): EntryMessage = {
+ /** Should normally not be used directly from application code, but needs to be public for access by macros. */
+ def traceEntryParams(params: Any*): EntryMessage = {
delegate.traceEntry(null, params) // TODO should not do ifEnabled check
}
- private[scala] def traceEntryMessage(message: Message): EntryMessage = {
+ /** Should normally not be used directly from application code, but needs to be public for access by macros. */
+ def traceEntryMessage(message: Message): EntryMessage = {
delegate.traceEntry(message) // TODO should not do ifEnabled check
}
- private[scala] def traceExitMessageResult[R](message: Message, result: R): Unit = {
+ /** Should normally not be used directly from application code, but needs to be public for access by macros. */
+ def traceExitMessageResult[R](message: Message, result: R): Unit = {
delegate.traceExit(message, result) // TODO should not do ifEnabled check
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cda39288/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 e57c86c..c662ef1 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
@@ -580,48 +580,57 @@ class Logger private(val delegate: ExtendedLogger) {
/** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified
* level is enabled.
*
+ * Should normally not be used directly from application code, but needs to be public for access by macros.
+ *
* @param level log level
* @param marker marker or `null`
* @param message message
* @param cause cause or `null`
*/
- private[scala] def logMessage(level: Level, marker: Marker, message: Message, cause: Throwable): Unit = {
+ def logMessage(level: Level, marker: Marker, message: Message, cause: Throwable): Unit = {
delegate.logMessage(FQCN, level, marker, message, cause)
}
/** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified
* level is enabled.
*
+ * Should normally not be used directly from application code, but needs to be public for access by macros.
+ *
* @param level log level
* @param marker marker or `null`
* @param message message
* @param cause cause or `null`
*/
- private[scala] def logMessage(level: Level, marker: Marker, message: CharSequence, cause: Throwable): Unit = {
+ def logMessage(level: Level, marker: Marker, message: CharSequence, cause: Throwable): Unit = {
delegate.logMessage(FQCN, level, marker, messageFactory.newMessage(message), cause)
}
/** Always logs a message at the specified level. It is the responsibility of the caller to ensure the specified
* level is enabled.
*
+ * Should normally not be used directly from application code, but needs to be public for access by macros.
+ *
* @param level log level
* @param marker marker or `null`
* @param message message
* @param cause cause or `null`
*/
- private[scala] def logMessage(level: Level, marker: Marker, message: AnyRef, cause: Throwable): Unit = {
+ def logMessage(level: Level, marker: Marker, message: AnyRef, cause: Throwable): Unit = {
delegate.logMessage(FQCN, level, marker, messageFactory.newMessage(message), cause)
}
- private[scala] def traceEntryParams(params: Any*): EntryMessage = {
+ /** Should normally not be used directly from application code, but needs to be public for access by macros. */
+ def traceEntryParams(params: Any*): EntryMessage = {
delegate.traceEntry(null, params) // TODO should not do ifEnabled check
}
- private[scala] def traceEntryMessage(message: Message): EntryMessage = {
+ /** Should normally not be used directly from application code, but needs to be public for access by macros. */
+ def traceEntryMessage(message: Message): EntryMessage = {
delegate.traceEntry(message) // TODO should not do ifEnabled check
}
- private[scala] def traceExitMessageResult[R](message: Message, result: R): Unit = {
+ /** Should normally not be used directly from application code, but needs to be public for access by macros. */
+ def traceExitMessageResult[R](message: Message, result: R): Unit = {
delegate.traceExit(message, result) // TODO should not do ifEnabled check
}