From 175ceb7654c7657539b2fc3084a37d4c1d8b081e Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Jun 2020 02:44:41 +0200 Subject: [PATCH] Apply last upstream modifications --- conf/jitsi-jicofo-logging.properties | 15 +++++++++++++-- conf/jitsi-videobridge-logging.properties | 14 -------------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/conf/jitsi-jicofo-logging.properties b/conf/jitsi-jicofo-logging.properties index 18c87ce..229f808 100644 --- a/conf/jitsi-jicofo-logging.properties +++ b/conf/jitsi-jicofo-logging.properties @@ -1,9 +1,15 @@ handlers= java.util.logging.ConsoleHandler + +# Handlers with XMPP debug enabled: +#handlers= java.util.logging.ConsoleHandler, org.jitsi.impl.protocol.xmpp.log.XmppPacketsFileHandler + +# Handlers with syslog enabled: #handlers= java.util.logging.ConsoleHandler, com.agafua.syslog.SyslogHandler java.util.logging.ConsoleHandler.level = ALL java.util.logging.ConsoleHandler.formatter = net.java.sip.communicator.util.ScLogFormatter +java.util.logging.ConsoleHandler.filter = org.jitsi.impl.protocol.xmpp.log.ExcludeXmppPackets net.java.sip.communicator.util.ScLogFormatter.programname=Jicofo @@ -18,8 +24,12 @@ net.java.sip.communicator.service.resources.AbstractResourcesService.level=SEVER #net.java.sip.communicator.service.protocol.level=ALL -# Enable debug packets logging -#org.jitsi.impl.protocol.xmpp.level=FINE +# To enable XMPP packets logging add XmppPacketsFileHandler to the handlers property +org.jitsi.impl.protocol.xmpp.log.PacketDebugger.level=ALL +org.jitsi.impl.protocol.xmpp.log.XmppPacketsFileHandler.pattern=/var/log/jitsi/jicofo-xmpp.log +org.jitsi.impl.protocol.xmpp.log.XmppPacketsFileHandler.append=true +org.jitsi.impl.protocol.xmpp.log.XmppPacketsFileHandler.limit=200000000 +org.jitsi.impl.protocol.xmpp.log.XmppPacketsFileHandler.count=3 # Syslog(uncomment handler to use) com.agafua.syslog.SyslogHandler.transport = udp @@ -28,6 +38,7 @@ com.agafua.syslog.SyslogHandler.port = 514 com.agafua.syslog.SyslogHandler.hostname = localhost com.agafua.syslog.SyslogHandler.formatter = net.java.sip.communicator.util.ScLogFormatter com.agafua.syslog.SyslogHandler.escapeNewlines = false +com.agafua.syslog.SyslogHandler.filter = org.jitsi.impl.protocol.xmpp.log.ExcludeXmppPackets # to disable double timestamps in syslog uncomment next line #net.java.sip.communicator.util.ScLogFormatter.disableTimestamp=true diff --git a/conf/jitsi-videobridge-logging.properties b/conf/jitsi-videobridge-logging.properties index 7df14c2..4a37486 100644 --- a/conf/jitsi-videobridge-logging.properties +++ b/conf/jitsi-videobridge-logging.properties @@ -23,17 +23,3 @@ com.agafua.syslog.SyslogHandler.escapeNewlines = false # to disable double timestamps in syslog uncomment next line #net.java.sip.communicator.util.ScLogFormatter.disableTimestamp=true - -# time series logging -java.util.logging.SimpleFormatter.format= %5$s%n -java.util.logging.FileHandler.level = ALL -java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter -java.util.logging.FileHandler.pattern = /tmp/jvb-series.log -java.util.logging.FileHandler.limit = 200000000 -java.util.logging.FileHandler.count = 1 -java.util.logging.FileHandler.append = false - -timeseries.level=OFF -timeseries.org.jitsi.videobridge.cc.vp8.level=ALL -timeseries.useParentHandlers = false -timeseries.handlers = java.util.logging.FileHandler