Skip to content

Commit 6ebf6e8

Browse files
authored
Merge pull request #1205 from bgrozev/update-log-formatters
Use the new log formatters, clean up stale logging config.
2 parents a862e84 + 8004ffe commit 6ebf6e8

File tree

3 files changed

+11
-25
lines changed

3 files changed

+11
-25
lines changed
+7-7
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
handlers = java.util.logging.FileHandler, java.util.logging.ConsoleHandler
22

3+
org.jitsi.utils.logging2.JitsiLogFormatter.programname=Jibri
4+
35
java.util.logging.FileHandler.level = FINE
46
java.util.logging.FileHandler.pattern = {{ .Env.JIBRI_LOGS_DIR }}/log.%g.txt
5-
java.util.logging.FileHandler.formatter = net.java.sip.communicator.util.ScLogFormatter
7+
java.util.logging.FileHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter
68
java.util.logging.FileHandler.count = 10
79
java.util.logging.FileHandler.limit = 10000000
810

911
org.jitsi.jibri.capture.ffmpeg.util.FfmpegFileHandler.level = FINE
1012
org.jitsi.jibri.capture.ffmpeg.util.FfmpegFileHandler.pattern = {{ .Env.JIBRI_LOGS_DIR }}/ffmpeg.%g.txt
11-
org.jitsi.jibri.capture.ffmpeg.util.FfmpegFileHandler.formatter = net.java.sip.communicator.util.ScLogFormatter
13+
org.jitsi.jibri.capture.ffmpeg.util.FfmpegFileHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter
1214
org.jitsi.jibri.capture.ffmpeg.util.FfmpegFileHandler.count = 10
1315
org.jitsi.jibri.capture.ffmpeg.util.FfmpegFileHandler.limit = 10000000
1416

1517
org.jitsi.jibri.sipgateway.pjsua.util.PjsuaFileHandler.level = FINE
1618
org.jitsi.jibri.sipgateway.pjsua.util.PjsuaFileHandler.pattern = {{ .Env.JIBRI_LOGS_DIR }}/pjsua.%g.txt
17-
org.jitsi.jibri.sipgateway.pjsua.util.PjsuaFileHandler.formatter = net.java.sip.communicator.util.ScLogFormatter
19+
org.jitsi.jibri.sipgateway.pjsua.util.PjsuaFileHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter
1820
org.jitsi.jibri.sipgateway.pjsua.util.PjsuaFileHandler.count = 10
1921
org.jitsi.jibri.sipgateway.pjsua.util.PjsuaFileHandler.limit = 10000000
2022

2123
org.jitsi.jibri.selenium.util.BrowserFileHandler.level = FINE
2224
org.jitsi.jibri.selenium.util.BrowserFileHandler.pattern = {{ .Env.JIBRI_LOGS_DIR }}/browser.%g.txt
23-
org.jitsi.jibri.selenium.util.BrowserFileHandler.formatter = net.java.sip.communicator.util.ScLogFormatter
25+
org.jitsi.jibri.selenium.util.BrowserFileHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter
2426
org.jitsi.jibri.selenium.util.BrowserFileHandler.count = 10
2527
org.jitsi.jibri.selenium.util.BrowserFileHandler.limit = 10000000
2628

2729
java.util.logging.ConsoleHandler.level = FINE
28-
java.util.logging.ConsoleHandler.formatter = net.java.sip.communicator.util.ScLogFormatter
30+
java.util.logging.ConsoleHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter
2931

3032
org.jitsi.level = FINE
31-
3233
org.glassfish.level = INFO
33-
org.osgi.level = INFO

jicofo/rootfs/defaults/logging.properties

+2-12
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,12 @@ handlers= java.util.logging.ConsoleHandler
55
{{ end }}
66

77
java.util.logging.ConsoleHandler.level = ALL
8-
java.util.logging.ConsoleHandler.formatter = net.java.sip.communicator.util.ScLogFormatter
9-
10-
net.java.sip.communicator.util.ScLogFormatter.programname=Jicofo
8+
java.util.logging.ConsoleHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter
9+
org.jitsi.utils.logging2.JitsiLogFormatter.programname=Jicofo
1110

1211
.level=INFO
13-
net.sf.level=SEVERE
14-
net.java.sip.communicator.plugin.reconnectplugin.level=FINE
15-
org.ice4j.level=SEVERE
16-
org.jitsi.impl.neomedia.level=SEVERE
1712
io.sentry.jul.SentryHandler.level=WARNING
1813

19-
# Do not worry about missing strings
20-
net.java.sip.communicator.service.resources.AbstractResourcesService.level=SEVERE
21-
22-
#net.java.sip.communicator.service.protocol.level=ALL
23-
2414
# Enable debug packets logging
2515
#org.jitsi.impl.protocol.xmpp.level=FINE
2616

jvb/rootfs/defaults/logging.properties

+2-6
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,9 @@ handlers= java.util.logging.ConsoleHandler
55
{{ end }}
66

77
java.util.logging.ConsoleHandler.level = ALL
8-
java.util.logging.ConsoleHandler.formatter = net.java.sip.communicator.util.ScLogFormatter
9-
10-
net.java.sip.communicator.util.ScLogFormatter.programname=JVB
8+
java.util.logging.ConsoleHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter
9+
org.jitsi.utils.logging2.JitsiLogFormatter.programname=JVB
1110

1211
.level=INFO
13-
org.jitsi.videobridge.xmpp.ComponentImpl.level=FINE
1412
io.sentry.jul.SentryHandler.level=WARNING
1513

16-
# All of the INFO level logs from MediaStreamImpl are unnecessary in the context of jitsi-videobridge.
17-
org.jitsi.impl.neomedia.MediaStreamImpl.level=WARNING

0 commit comments

Comments
 (0)