From 0fa543121f191c18212ad222acb7aab1bfc91b84 Mon Sep 17 00:00:00 2001
From: eikek-scala-steward <eikek-scala-steward@users.noreply.github.comb>
Date: Thu, 7 Jul 2022 06:14:47 +0000
Subject: [PATCH] Update scribe, scribe-slf4j to 3.10.0
---
.../docspell/logging/impl/ScribeWrapper.scala | 14 +++++++++++++-
project/Dependencies.scala | 2 +-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/modules/logging/scribe/src/main/scala/docspell/logging/impl/ScribeWrapper.scala b/modules/logging/scribe/src/main/scala/docspell/logging/impl/ScribeWrapper.scala
index 143fe7fc..49bf07d8 100644
--- a/modules/logging/scribe/src/main/scala/docspell/logging/impl/ScribeWrapper.scala
+++ b/modules/logging/scribe/src/main/scala/docspell/logging/impl/ScribeWrapper.scala
@@ -12,6 +12,7 @@ import cats.effect.Sync
import docspell.logging.{Level, LogEvent, Logger}
import scribe.LoggerSupport
+import scribe.data.{MDC, MDCMap}
import scribe.message.LoggableMessage
private[logging] object ScribeWrapper {
@@ -38,13 +39,24 @@ private[logging] object ScribeWrapper {
case Level.Trace => scribe.Level.Trace
}
+ private[this] def emptyMDC: MDC =
+ new MDCMap(None)
+
private[this] def convert(ev: LogEvent) = {
val level = convertLevel(ev.level)
val additional: List[LoggableMessage] = ev.additional.map {
case Right(ex) => LoggableMessage.throwable2Message(ex)
case Left(msg) => LoggableMessage.string2Message(msg)
}.toList
- LoggerSupport(level, ev.msg() :: additional, ev.pkg, ev.fileName, ev.name, ev.line)
+ LoggerSupport(
+ level,
+ ev.msg() :: additional,
+ ev.pkg,
+ ev.fileName,
+ ev.name,
+ ev.line,
+ emptyMDC
+ )
.copy(data = ev.data.toDeferred)
}
}
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index fcbed931..4dd2bda8 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -43,7 +43,7 @@ object Dependencies {
val PureConfigVersion = "0.17.1"
val ScalaJavaTimeVersion = "2.4.0"
val ScodecBitsVersion = "1.1.34"
- val ScribeVersion = "3.9.0"
+ val ScribeVersion = "3.10.0"
val Slf4jVersion = "1.7.36"
val SourcecodeVersion = "0.2.8"
val StanfordNlpVersion = "4.4.0"