TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-04 10:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adopt to new scribe version

Browse Source
This commit is contained in:
eikek 2022-02-22 22:40:00 +01:00
parent 5951089d70
commit 0c56549736
2 changed files with 5 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/logging/scribe/src/main/scala/docspell/logging/impl/ScribeConfigure.scala
View File

@ -13,6 +13,7 @@ import docspell.logging.{Level, LogConfig}
import scribe.format.Formatter
import scribe.jul.JULHandler
import scribe.writer.SystemOutWriter
object ScribeConfigure {
private[this] val docspellRootVerbose = "DOCSPELL_ROOT_LOGGER_LEVEL"
@ -45,13 +46,13 @@ object ScribeConfigure {
l =>
cfg.format match {
case Format.Fancy =>
l.withHandler(formatter = Formatter.enhanced, writer = StdoutWriter)
l.withHandler(formatter = Formatter.enhanced, writer = SystemOutWriter)
case Format.Plain =>
l.withHandler(formatter = Formatter.classic, writer = StdoutWriter)
l.withHandler(formatter = Formatter.classic, writer = SystemOutWriter)
case Format.Json =>
l.withHandler(writer = JsonWriter(StdoutWriter))
l.withHandler(writer = JsonWriter(SystemOutWriter))
case Format.Logfmt =>
l.withHandler(writer = LogfmtWriter(StdoutWriter))
l.withHandler(writer = LogfmtWriter(SystemOutWriter))
},
_.replace()
)

56
modules/logging/scribe/src/main/scala/docspell/logging/impl/StdoutWriter.scala
View File

@ -1,56 +0,0 @@
/*
* Copyright 2020 Eike K. & Contributors
*
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
package docspell.logging.impl
import scribe._
import scribe.output.LogOutput
import scribe.output.format.OutputFormat
import scribe.writer.Writer
// From: https://github.com/outr/scribe/blob/8e99521e1ee1f0c421629764dd96e4eb193d84bd/core/shared/src/main/scala/scribe/writer/SystemOutputWriter.scala
// Modified to always log to stdout. The original code was logging to stdout and stderr
// depending on the log level.
// Original code licensed under MIT
private[impl] object StdoutWriter extends Writer {
/** If true, will always synchronize writing to the console to avoid interleaved text.
* Most native consoles will handle this automatically, but IntelliJ and Eclipse are
* notorious about not properly handling this. Defaults to true.
*/
val synchronizeWriting: Boolean = true
/** Workaround for some consoles that don't play nicely with asynchronous calls */
val alwaysFlush: Boolean = false
private val stringBuilders = new ThreadLocal[StringBuilder] {
override def initialValue(): StringBuilder = new StringBuilder(512)
}
@annotation.nowarn
override def write[M](
record: LogRecord[M],
output: LogOutput,
outputFormat: OutputFormat
): Unit = {
val stream = Logger.system.out
val sb = stringBuilders.get()
outputFormat.begin(sb.append(_))
outputFormat(output, s => sb.append(s))
outputFormat.end(sb.append(_))
if (synchronizeWriting) {
synchronized {
stream.println(sb.toString())
if (alwaysFlush) stream.flush()
}
} else {
stream.println(sb.toString())
if (alwaysFlush) stream.flush()
}
sb.clear()
}
}