Procházet zdrojové kódy

Use the new log formatters, clean up stale logging config.

Boris Grozev před 3 roky
rodič
revize
8004ffe

+ 7 - 7
jibri/rootfs/defaults/logging.properties

@@ -1,33 +1,33 @@
 handlers = java.util.logging.FileHandler, java.util.logging.ConsoleHandler
 
+org.jitsi.utils.logging2.JitsiLogFormatter.programname=Jibri
+
 java.util.logging.FileHandler.level = FINE
 java.util.logging.FileHandler.pattern   = {{ .Env.JIBRI_LOGS_DIR }}/log.%g.txt
-java.util.logging.FileHandler.formatter = net.java.sip.communicator.util.ScLogFormatter
+java.util.logging.FileHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter
 java.util.logging.FileHandler.count = 10
 java.util.logging.FileHandler.limit = 10000000
 
 org.jitsi.jibri.capture.ffmpeg.util.FfmpegFileHandler.level = FINE
 org.jitsi.jibri.capture.ffmpeg.util.FfmpegFileHandler.pattern   = {{ .Env.JIBRI_LOGS_DIR }}/ffmpeg.%g.txt
-org.jitsi.jibri.capture.ffmpeg.util.FfmpegFileHandler.formatter = net.java.sip.communicator.util.ScLogFormatter
+org.jitsi.jibri.capture.ffmpeg.util.FfmpegFileHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter
 org.jitsi.jibri.capture.ffmpeg.util.FfmpegFileHandler.count = 10
 org.jitsi.jibri.capture.ffmpeg.util.FfmpegFileHandler.limit = 10000000
 
 org.jitsi.jibri.sipgateway.pjsua.util.PjsuaFileHandler.level = FINE
 org.jitsi.jibri.sipgateway.pjsua.util.PjsuaFileHandler.pattern   = {{ .Env.JIBRI_LOGS_DIR }}/pjsua.%g.txt
-org.jitsi.jibri.sipgateway.pjsua.util.PjsuaFileHandler.formatter = net.java.sip.communicator.util.ScLogFormatter
+org.jitsi.jibri.sipgateway.pjsua.util.PjsuaFileHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter
 org.jitsi.jibri.sipgateway.pjsua.util.PjsuaFileHandler.count = 10
 org.jitsi.jibri.sipgateway.pjsua.util.PjsuaFileHandler.limit = 10000000
 
 org.jitsi.jibri.selenium.util.BrowserFileHandler.level = FINE
 org.jitsi.jibri.selenium.util.BrowserFileHandler.pattern   = {{ .Env.JIBRI_LOGS_DIR }}/browser.%g.txt
-org.jitsi.jibri.selenium.util.BrowserFileHandler.formatter = net.java.sip.communicator.util.ScLogFormatter
+org.jitsi.jibri.selenium.util.BrowserFileHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter
 org.jitsi.jibri.selenium.util.BrowserFileHandler.count = 10
 org.jitsi.jibri.selenium.util.BrowserFileHandler.limit = 10000000
 
 java.util.logging.ConsoleHandler.level = FINE
-java.util.logging.ConsoleHandler.formatter = net.java.sip.communicator.util.ScLogFormatter
+java.util.logging.ConsoleHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter
 
 org.jitsi.level = FINE
-
 org.glassfish.level = INFO
-org.osgi.level = INFO

+ 2 - 12
jicofo/rootfs/defaults/logging.properties

@@ -5,22 +5,12 @@ handlers= java.util.logging.ConsoleHandler
 {{ end }}
 
 java.util.logging.ConsoleHandler.level = ALL
-java.util.logging.ConsoleHandler.formatter = net.java.sip.communicator.util.ScLogFormatter
-
-net.java.sip.communicator.util.ScLogFormatter.programname=Jicofo
+java.util.logging.ConsoleHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter
+org.jitsi.utils.logging2.JitsiLogFormatter.programname=Jicofo
 
 .level=INFO
-net.sf.level=SEVERE
-net.java.sip.communicator.plugin.reconnectplugin.level=FINE
-org.ice4j.level=SEVERE
-org.jitsi.impl.neomedia.level=SEVERE
 io.sentry.jul.SentryHandler.level=WARNING
 
-# Do not worry about missing strings
-net.java.sip.communicator.service.resources.AbstractResourcesService.level=SEVERE
-
-#net.java.sip.communicator.service.protocol.level=ALL
-
 # Enable debug packets logging
 #org.jitsi.impl.protocol.xmpp.level=FINE
 

+ 2 - 6
jvb/rootfs/defaults/logging.properties

@@ -5,13 +5,9 @@ handlers= java.util.logging.ConsoleHandler
 {{ end }}
 
 java.util.logging.ConsoleHandler.level = ALL
-java.util.logging.ConsoleHandler.formatter = net.java.sip.communicator.util.ScLogFormatter
-
-net.java.sip.communicator.util.ScLogFormatter.programname=JVB
+java.util.logging.ConsoleHandler.formatter = org.jitsi.utils.logging2.JitsiLogFormatter
+org.jitsi.utils.logging2.JitsiLogFormatter.programname=JVB
 
 .level=INFO
-org.jitsi.videobridge.xmpp.ComponentImpl.level=FINE
 io.sentry.jul.SentryHandler.level=WARNING
 
-# All of the INFO level logs from MediaStreamImpl are unnecessary in the context of jitsi-videobridge.
-org.jitsi.impl.neomedia.MediaStreamImpl.level=WARNING