TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-11 21:39:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1615 from eikek/update/scribe-3.10.0

Browse Source 
Update scribe, scribe-slf4j to 3.10.0
This commit is contained in:
mergify[bot] 2022-07-08 08:57:01 +00:00 committed by GitHub
commit 34571556e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/logging/scribe/src/main/scala/docspell/logging/impl/ScribeWrapper.scala
View File

@ -12,6 +12,7 @@ import cats.effect.Sync
import docspell.logging.{Level, LogEvent, Logger} import docspell.logging.{Level, LogEvent, Logger}
import scribe.LoggerSupport import scribe.LoggerSupport
import scribe.data.{MDC, MDCMap}
import scribe.message.LoggableMessage import scribe.message.LoggableMessage
private[logging] object ScribeWrapper { private[logging] object ScribeWrapper {
@ -38,13 +39,24 @@ private[logging] object ScribeWrapper {
case Level.Trace => scribe.Level.Trace case Level.Trace => scribe.Level.Trace
} }
private[this] def emptyMDC: MDC =
new MDCMap(None)
private[this] def convert(ev: LogEvent) = { private[this] def convert(ev: LogEvent) = {
val level = convertLevel(ev.level) val level = convertLevel(ev.level)
val additional: List[LoggableMessage] = ev.additional.map { val additional: List[LoggableMessage] = ev.additional.map {
case Right(ex) => LoggableMessage.throwable2Message(ex) case Right(ex) => LoggableMessage.throwable2Message(ex)
case Left(msg) => LoggableMessage.string2Message(msg) case Left(msg) => LoggableMessage.string2Message(msg)
}.toList }.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) .copy(data = ev.data.toDeferred)
} }
} }

2
project/Dependencies.scala
View File

@ -43,7 +43,7 @@ object Dependencies {
val PureConfigVersion = "0.17.1" val PureConfigVersion = "0.17.1"
val ScalaJavaTimeVersion = "2.4.0" val ScalaJavaTimeVersion = "2.4.0"
val ScodecBitsVersion = "1.1.34" val ScodecBitsVersion = "1.1.34"
val ScribeVersion = "3.9.0" val ScribeVersion = "3.10.0"
val Slf4jVersion = "1.7.36" val Slf4jVersion = "1.7.36"
val SourcecodeVersion = "0.2.8" val SourcecodeVersion = "0.2.8"
val StanfordNlpVersion = "4.4.0" val StanfordNlpVersion = "4.4.0"