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

Remove old log stuff

Browse Source
This commit is contained in:
eikek
2022-02-19 22:01:49 +01:00
parent e483a97de7
commit 8b42708db2
9 changed files with 18 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
build.sbt
View File

@ -463,7 +463,6 @@ val store = project
Dependencies.fs2 ++ Dependencies.fs2 ++
Dependencies.databases ++ Dependencies.databases ++
Dependencies.flyway ++ Dependencies.flyway ++
Dependencies.loggingApi ++
Dependencies.emil ++ Dependencies.emil ++
Dependencies.emilDoobie ++ Dependencies.emilDoobie ++
Dependencies.calevCore ++ Dependencies.calevCore ++
@ -532,8 +531,7 @@ val extract = project
Dependencies.twelvemonkeys ++ Dependencies.twelvemonkeys ++
Dependencies.pdfbox ++ Dependencies.pdfbox ++
Dependencies.poi ++ Dependencies.poi ++
Dependencies.commonsIO ++ Dependencies.commonsIO
Dependencies.julOverSlf4j
) )
.dependsOn(common, loggingScribe, files % "compile->compile;test->test") .dependsOn(common, loggingScribe, files % "compile->compile;test->test")
@ -638,7 +636,6 @@ val backend = project
.settings( .settings(
name := "docspell-backend", name := "docspell-backend",
libraryDependencies ++= libraryDependencies ++=
Dependencies.loggingApi ++
Dependencies.fs2 ++ Dependencies.fs2 ++
Dependencies.bcrypt ++ Dependencies.bcrypt ++
Dependencies.http4sClient ++ Dependencies.http4sClient ++
@ -654,7 +651,6 @@ val oidc = project
.settings( .settings(
name := "docspell-oidc", name := "docspell-oidc",
libraryDependencies ++= libraryDependencies ++=
Dependencies.loggingApi ++
Dependencies.fs2 ++ Dependencies.fs2 ++
Dependencies.http4sClient ++ Dependencies.http4sClient ++
Dependencies.http4sCirce ++ Dependencies.http4sCirce ++
@ -713,9 +709,7 @@ val joex = project
Dependencies.emilMarkdown ++ Dependencies.emilMarkdown ++
Dependencies.emilJsoup ++ Dependencies.emilJsoup ++
Dependencies.jsoup ++ Dependencies.jsoup ++
Dependencies.yamusca ++ Dependencies.yamusca,
Dependencies.loggingApi ++
Dependencies.logging.map(_ % Runtime),
addCompilerPlugin(Dependencies.betterMonadicFor), addCompilerPlugin(Dependencies.betterMonadicFor),
buildInfoPackage := "docspell.joex", buildInfoPackage := "docspell.joex",
reStart / javaOptions ++= Seq( reStart / javaOptions ++= Seq(
@ -767,9 +761,7 @@ val restserver = project
Dependencies.pureconfig ++ Dependencies.pureconfig ++
Dependencies.yamusca ++ Dependencies.yamusca ++
Dependencies.kittens ++ Dependencies.kittens ++
Dependencies.webjars ++ Dependencies.webjars,
Dependencies.loggingApi ++
Dependencies.logging.map(_ % Runtime),
addCompilerPlugin(Dependencies.betterMonadicFor), addCompilerPlugin(Dependencies.betterMonadicFor),
buildInfoPackage := "docspell.restserver", buildInfoPackage := "docspell.restserver",
Compile / sourceGenerators += Def.task { Compile / sourceGenerators += Def.task {

14
modules/files/src/test/resources/logback-test.xml
View File

@ -1,14 +0,0 @@
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<withJansi>true</withJansi>
<encoder>
<pattern>level=%-5level thread=%thread logger=%logger{15} message="%replace(%msg){'"', '\\"'}"%n</pattern>
</encoder>
</appender>
<logger name="docspell" level="debug" />
<root level="error">
<appender-ref ref="STDOUT" />
</root>
</configuration>

14
modules/joex/src/main/resources/logback.xml
View File

@ -1,14 +0,0 @@
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<withJansi>true</withJansi>
<encoder>
<pattern>level=%-5level thread=%thread logger=%logger{15} message="%replace(%msg){'"', '\\"'}"%n</pattern>
</encoder>
</appender>
<logger name="docspell" level="debug" />
<root level="INFO">
<appender-ref ref="STDOUT" />
</root>
</configuration>

4
modules/joex/src/main/resources/reference.conf
View File

@ -22,11 +22,11 @@ docspell.joex {
logging { logging {
# The format for the log messages. Can be one of: # The format for the log messages. Can be one of:
# Json, Logfmt, Fancy or Plain # Json, Logfmt, Fancy or Plain
format = "Json" format = "Plain"
# The minimum level to log. From lowest to highest: # The minimum level to log. From lowest to highest:
# Trace, Debug, Info, Warn, Error # Trace, Debug, Info, Warn, Error
minimumLevel = "Debug" minimum-level = "Info"
} }
# The database connection. # The database connection.

16
modules/restserver/src/main/resources/logback.xml
View File

@ -1,16 +0,0 @@
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<withJansi>true</withJansi>
<encoder>
<pattern>level=%-5level thread=%thread logger=%logger{15} message="%replace(%msg){'"', '\\"'}"%n</pattern>
</encoder>
</appender>
<logger name="docspell" level="debug" />
<logger name="emil" level="debug"/>
<logger name="org.http4s.server.message-failures" level="debug"/>
<root level="INFO">
<appender-ref ref="STDOUT" />
</root>
</configuration>

4
modules/restserver/src/main/resources/reference.conf
View File

@ -25,11 +25,11 @@ docspell.server {
logging { logging {
# The format for the log messages. Can be one of: # The format for the log messages. Can be one of:
# Json, Logfmt, Fancy or Plain # Json, Logfmt, Fancy or Plain
format = "Json" format = "Plain"
# The minimum level to log. From lowest to highest: # The minimum level to log. From lowest to highest:
# Trace, Debug, Info, Warn, Error # Trace, Debug, Info, Warn, Error
minimumLevel = "Debug" minimum-level = "Info"
} }
# Where the server binds to. # Where the server binds to.

14
modules/store/src/test/resources/logback-test.xml
View File

@ -1,14 +0,0 @@
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<withJansi>true</withJansi>
<encoder>
<pattern>level=%-5level thread=%thread logger=%logger{15} message="%replace(%msg){'"', '\\"'}"%n</pattern>
</encoder>
</appender>
<logger name="docspell" level="warn" />
<root level="error">
<appender-ref ref="STDOUT" />
</root>
</configuration>

20
project/Dependencies.scala
View File

@ -119,9 +119,9 @@ object Dependencies {
val jclOverSlf4j = Seq( val jclOverSlf4j = Seq(
"org.slf4j" % "jcl-over-slf4j" % Slf4jVersion "org.slf4j" % "jcl-over-slf4j" % Slf4jVersion
) )
val julOverSlf4j = Seq( // val julOverSlf4j = Seq(
"org.slf4j" % "jul-to-slf4j" % Slf4jVersion // "org.slf4j" % "jul-to-slf4j" % Slf4jVersion
) // )
val poi = Seq( val poi = Seq(
"org.apache.poi" % "poi" % PoiVersion, "org.apache.poi" % "poi" % PoiVersion,
@ -269,14 +269,14 @@ object Dependencies {
"io.circe" %% "circe-generic-extras" % CirceVersion "io.circe" %% "circe-generic-extras" % CirceVersion
) )
// https://github.com/Log4s/log4s;ASL 2.0 // // https://github.com/Log4s/log4s;ASL 2.0
val loggingApi = Seq( // val loggingApi = Seq(
"org.log4s" %% "log4s" % Log4sVersion // "org.log4s" %% "log4s" % Log4sVersion
) // )
val logging = Seq( // val logging = Seq(
"ch.qos.logback" % "logback-classic" % LogbackVersion // "ch.qos.logback" % "logback-classic" % LogbackVersion
) // )
// https://github.com/melrief/pureconfig // https://github.com/melrief/pureconfig
// MPL 2.0 // MPL 2.0

2
project/TestSettings.scala
View File

@ -29,7 +29,7 @@ object TestSettingsPlugin extends AutoPlugin {
import autoImport._ import autoImport._
val testSettings = Seq( val testSettings = Seq(
libraryDependencies ++= inTest(Dependencies.munit, Dependencies.logging), libraryDependencies ++= inTest(Dependencies.munit, Dependencies.scribe),
testFrameworks += new TestFramework("munit.Framework") testFrameworks += new TestFramework("munit.Framework")
) )