diff --git a/modules/logging/layout/src/main/scala-2/tofu/logging/logback/ConsoleContextLayout.scala b/modules/logging/layout/src/main/scala-2/tofu/logging/logback/ConsoleContextLayout.scala index 8dabdd4b8..c1b3c5312 100644 --- a/modules/logging/layout/src/main/scala-2/tofu/logging/logback/ConsoleContextLayout.scala +++ b/modules/logging/layout/src/main/scala-2/tofu/logging/logback/ConsoleContextLayout.scala @@ -7,6 +7,7 @@ import ch.qos.logback.classic.spi.{ILoggingEvent, IThrowableProxy, LoggerContext import org.slf4j.Marker import tofu.logging.LoggedValue import tofu.logging.impl.ContextMarker +import org.slf4j.event.KeyValuePair class ConsoleContextLayout extends PatternLayout { @@ -15,7 +16,6 @@ class ConsoleContextLayout extends PatternLayout { } class WrappedEvent(event: ILoggingEvent) extends ILoggingEvent { - lazy val getMDCPropertyMap: util.Map[String, String] = { val map = new util.HashMap[String, String] map.putAll(event.getMDCPropertyMap) @@ -48,8 +48,16 @@ class WrappedEvent(event: ILoggingEvent) extends ILoggingEvent { def getThrowableProxy: IThrowableProxy = event.getThrowableProxy def getCallerData: Array[StackTraceElement] = event.getCallerData def hasCallerData: Boolean = event.hasCallerData - def getMarker: Marker = event.getMarker - def getMdc: util.Map[String, String] = getMDCPropertyMap - def getTimeStamp: Long = event.getTimeStamp - def prepareForDeferredProcessing(): Unit = event.prepareForDeferredProcessing() + + def getMdc: util.Map[String, String] = getMDCPropertyMap + def getTimeStamp: Long = event.getTimeStamp + def prepareForDeferredProcessing(): Unit = event.prepareForDeferredProcessing() + + def getMarkerList(): util.List[Marker] = event.getMarkerList + + def getNanoseconds(): Int = event.getNanoseconds + + def getSequenceNumber(): Long = event.getSequenceNumber + + def getKeyValuePairs(): util.List[KeyValuePair] = event.getKeyValuePairs() } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 8b9bdde8a..22170fab8 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -34,7 +34,7 @@ object Dependencies { val fs2CE3 = "3.6.1" - val logback = "1.2.12" + val logback = "1.4.7" val monix = "3.4.1" diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js index 8c60252d4..29def9acb 100644 --- a/website/docusaurus.config.js +++ b/website/docusaurus.config.js @@ -73,7 +73,7 @@ module.exports = { position: "right" }, { - href: "pathname:///api/index.html", + href: "pathname:///api/", label: "API", position: "right" }