TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-03-28 01:35:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update scribe

Browse Source
This commit is contained in:
eikek 2023-11-05 23:23:05 +01:00
parent 9ecd11ed7f
commit 84612bc7e7
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/logging/scribe/src/main/scala/docspell/logging/impl/Record.scala
View File

@ -12,7 +12,7 @@ import io.circe.syntax._
import io.circe.{Encoder, Json}
import perfolation._
import scribe.LogRecord
import scribe.data.MDC
import scribe.mdc.MDC
import scribe.message.Message
// From: https://github.com/outr/scribe/blob/8e99521e1ee1f0c421629764dd96e4eb193d84bd/json/shared/src/main/scala/scribe/json/JsonWriter.scala

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

@ -12,7 +12,7 @@ import cats.effect.Sync
import docspell.logging.{Level, LogEvent, Logger}
import scribe.LoggerSupport
import scribe.data.{MDC, MDCMap}
import scribe.mdc.{MDC, MDCMap}
import scribe.message.LoggableMessage
private[logging] object ScribeWrapper {
@ -44,10 +44,13 @@ private[logging] object ScribeWrapper {
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
val additional: List[LoggableMessage] = ev.additional
.map {
case Right(ex) => LoggableMessage.throwableList2Messages(List(ex))
case Left(msg) => LoggableMessage.stringList2Messages(List(msg))
}
.toList
.flatten
LoggerSupport(
level,
ev.msg() :: additional,

2
project/Dependencies.scala
View File

@ -42,7 +42,7 @@ object Dependencies {
val PureConfigVersion = "0.17.4"
val ScalaJavaTimeVersion = "2.5.0"
val ScodecBitsVersion = "1.1.38"
val ScribeVersion = "3.11.9"
val ScribeVersion = "3.12.2"
val Slf4jVersion = "2.0.9"
val SourcecodeVersion = "0.3.1"
val StanfordNlpVersion = "4.5.5"