Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Briar Desktop
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
briar
Briar Desktop
Commits
da82b571
Commit
da82b571
authored
3 years ago
by
Sebastian
Committed by
Mikolai Gütschow
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Bridge logging over slf4j to logback
parent
f50ac195
No related branches found
No related tags found
1 merge request
!37
Bridge logging over slf4j to logback
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
build.gradle.kts
+3
-0
3 additions, 0 deletions
build.gradle.kts
src/main/kotlin/org/briarproject/briar/desktop/Main.kt
+4
-0
4 additions, 0 deletions
src/main/kotlin/org/briarproject/briar/desktop/Main.kt
src/main/resources/logback.xml
+16
-0
16 additions, 0 deletions
src/main/resources/logback.xml
with
23 additions
and
0 deletions
build.gradle.kts
+
3
−
0
View file @
da82b571
...
...
@@ -57,6 +57,9 @@ dependencies {
implementation
(
project
(
path
=
":briar-core"
,
configuration
=
"default"
))
implementation
(
project
(
path
=
":bramble-java"
,
configuration
=
"default"
))
implementation
(
"org.slf4j:jul-to-slf4j:1.7.32"
)
implementation
(
"ch.qos.logback:logback-classic:1.2.6"
)
val
daggerVersion
=
"2.24"
kapt
(
"com.google.dagger:dagger-compiler:$daggerVersion"
)
...
...
This diff is collapsed.
Click to expand it.
src/main/kotlin/org/briarproject/briar/desktop/Main.kt
+
4
−
0
View file @
da82b571
...
...
@@ -15,6 +15,7 @@ import org.briarproject.briar.BriarCoreEagerSingletons
import
org.briarproject.briar.desktop.utils.FileUtils
import
org.briarproject.briar.desktop.utils.InternationalizationUtils.i18n
import
org.briarproject.briar.desktop.utils.InternationalizationUtils.i18nF
import
org.slf4j.bridge.SLF4JBridgeHandler
import
java.io.File.separator
import
java.io.IOException
import
java.lang.System.getProperty
...
...
@@ -63,6 +64,9 @@ private class Main : CliktCommand(
else
->
ALL
}
SLF4JBridgeHandler
.
removeHandlersForRootLogger
()
SLF4JBridgeHandler
.
install
()
LogManager
.
getLogManager
().
getLogger
(
""
).
level
=
level
val
dataDir
=
getDataDir
()
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/logback.xml
0 → 100644
+
16
−
0
View file @
da82b571
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<appender
name=
"STDOUT"
class=
"ch.qos.logback.core.ConsoleAppender"
>
<encoder>
<pattern>
%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
</pattern>
</encoder>
</appender>
<logger
name=
"org.briarproject.briar"
level=
"INFO"
/>
<logger
name=
"org.briarproject.briar.desktop"
level=
"INFO"
/>
<root
level=
"info"
>
<appender-ref
ref=
"STDOUT"
/>
</root>
</configuration>
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment