use new logger (#976)

jitsi · Nov 11, 2019 · 7a7f5cf · 7a7f5cf
1 parent c6780ee
commit 7a7f5cf
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 49 deletions.
diff --git a/src/main/java/org/jitsi/videobridge/VideobridgeExpireThread.java b/src/main/java/org/jitsi/videobridge/VideobridgeExpireThread.java
@@ -21,7 +21,7 @@
 import org.jitsi.osgi.*;
 import org.jitsi.service.configuration.*;
 import org.jitsi.utils.concurrent.*;
-import org.jitsi.utils.logging.*;
+import org.jitsi.utils.logging2.*;
 import org.osgi.framework.*;
 
 /**
@@ -36,8 +36,8 @@ public class VideobridgeExpireThread
      * The <tt>Logger</tt> used by the <tt>VideobridgeExpireThread</tt> class
      * and its instances to print debug information.
      */
-    private static final Logger logger
-        = Logger.getLogger(VideobridgeExpireThread.class);
+    private static final Logger logger =
+        new LoggerImpl(VideobridgeExpireThread.class.getName());
 
     /**
      * The executor which periodically calls {@link #expire(Videobridge)} (if

diff --git a/...main/java/org/jitsi/videobridge/eventadmin/callstats/CallStatsConferenceStatsHandler.java b/...main/java/org/jitsi/videobridge/eventadmin/callstats/CallStatsConferenceStatsHandler.java
@@ -21,7 +21,7 @@
 import org.jitsi.eventadmin.*;
 import org.jitsi.stats.media.*;
 import org.jitsi.utils.concurrent.*;
-import org.jitsi.utils.logging.*;
+import org.jitsi.utils.logging2.*;
 import org.jitsi.videobridge.*;
 
 /**
@@ -38,7 +38,7 @@ class CallStatsConferenceStatsHandler
      * class and its instances to print debug information.
      */
     private static final Logger logger
-        = Logger.getLogger(CallStatsConferenceStatsHandler.class);
+        = new LoggerImpl(CallStatsConferenceStatsHandler.class.getName());
 
     /**
      * The {@link RecurringRunnableExecutor} which periodically invokes
@@ -117,7 +117,7 @@ public void handleEvent(Event event)
     {
         if (event == null)
         {
-            logger.debug("Could not handle an event because it was null.");
+            logger.debug(() -> "Could not handle an event because it was null.");
             return;
         }
 
@@ -143,9 +143,8 @@ private void conferenceCreated(final Conference conference)
     {
         if (conference == null)
         {
-            logger.debug(
-                    "Could not log conference created event because the"
-                        + " conference is null.");
+            logger.debug(() -> "Could not log conference created event because " +
+                "the conference is null.");
             return;
         }
 
@@ -172,9 +171,8 @@ private void conferenceExpired(Conference conference)
     {
         if (conference == null)
         {
-            logger.debug(
-                    "Could not log conference expired event because the"
-                        + " conference is null.");
+            logger.debug(() -> "Could not log conference expired event " +
+                "because the conference is null.");
             return;
         }
 

diff --git a/src/main/java/org/jitsi/videobridge/octo/OctoRelayService.java b/src/main/java/org/jitsi/videobridge/octo/OctoRelayService.java
@@ -17,7 +17,7 @@
 
 import org.jitsi.osgi.*;
 import org.jitsi.service.configuration.*;
-import org.jitsi.utils.logging.*;
+import org.jitsi.utils.logging2.*;
 import org.osgi.framework.*;
 
 import java.net.*;
@@ -35,7 +35,7 @@ public class OctoRelayService
      * instances to print debug information.
      */
     private static final Logger logger
-        = Logger.getLogger(OctoRelayService.class);
+        = new LoggerImpl(OctoRelayService.class.getName());
 
     /**
      * The name of the configuration property which controls the address on

diff --git a/src/main/java/org/jitsi/videobridge/osgi/ConfigurationActivator.java b/src/main/java/org/jitsi/videobridge/osgi/ConfigurationActivator.java
@@ -17,7 +17,7 @@
 
 import org.jitsi.service.configuration.*;
 import org.jitsi.service.libjitsi.*;
-import org.jitsi.utils.logging.*;
+import org.jitsi.utils.logging2.*;
 import org.osgi.framework.*;
 
 /**
@@ -32,7 +32,7 @@ public class ConfigurationActivator
      * The logger instance used by this class.
      */
     private final static Logger logger
-            = Logger.getLogger(ConfigurationActivator.class);
+            = new LoggerImpl(ConfigurationActivator.class.getName());
 
     @Override
     public void start(BundleContext bundleContext)

diff --git a/src/main/java/org/jitsi/videobridge/pubsub/PubSubPublisher.java b/src/main/java/org/jitsi/videobridge/pubsub/PubSubPublisher.java
@@ -20,7 +20,7 @@
 
 import org.jitsi.videobridge.stats.*;
 import org.jitsi.videobridge.xmpp.*;
-import org.jitsi.utils.logging.*;
+import org.jitsi.utils.logging2.*;
 import org.jivesoftware.smack.packet.*;
 import org.jivesoftware.smack.packet.id.*;
 import org.jivesoftware.smackx.pubsub.*;
@@ -50,7 +50,7 @@ public class PubSubPublisher
      * instances to print debug information.
      */
     private static final Logger logger
-        = Logger.getLogger(PubSubPublisher.class);
+        = new LoggerImpl(PubSubPublisher.class.getName());
 
     /**
      * The default timeout of the packets in milliseconds.

diff --git a/src/main/java/org/jitsi/videobridge/stats/ColibriStatsTransport.java b/src/main/java/org/jitsi/videobridge/stats/ColibriStatsTransport.java
@@ -20,7 +20,7 @@
 import org.jitsi.osgi.*;
 import org.jitsi.videobridge.*;
 import org.jitsi.videobridge.xmpp.*;
-import org.jitsi.utils.logging.*;
+import org.jitsi.utils.logging2.*;
 import org.jitsi.xmpp.extensions.colibri.*;
 import org.jivesoftware.smack.packet.*;
 import org.jxmpp.jid.*;
@@ -39,7 +39,7 @@ public class ColibriStatsTransport
      * its instances to print debug information.
      */
     private static final Logger logger
-        = Logger.getLogger(ColibriStatsTransport.class);
+        = new LoggerImpl(ColibriStatsTransport.class.getName());
 
     /**
      * Builds the IQ packet that will be sent.

diff --git a/src/main/java/org/jitsi/videobridge/stats/MucStatsTransport.java b/src/main/java/org/jitsi/videobridge/stats/MucStatsTransport.java
@@ -16,8 +16,8 @@
 package org.jitsi.videobridge.stats;
 
 import org.jitsi.osgi.*;
+import org.jitsi.utils.logging2.*;
 import org.jitsi.videobridge.xmpp.*;
-import org.jitsi.utils.logging.*;
 
 /**
  * Implements a {@link StatsTransport} which publishes via Presence in an XMPP
@@ -33,7 +33,7 @@ public class MucStatsTransport
      * its instances to print debug information.
      */
     private static final Logger logger
-        = Logger.getLogger(MucStatsTransport.class);
+        = new LoggerImpl(MucStatsTransport.class.getName());
 
     /**
      * Gets the {@link ClientConnectionImpl} to be used to publish
@@ -56,10 +56,7 @@ public void publishStatistics(Statistics stats)
             = getUserConnectionBundleActivator();
         if (clientConnectionImpl != null)
         {
-            if (logger.isDebugEnabled())
-            {
-                logger.debug("Publishing statistics through MUC: " + stats);
-            }
+            logger.debug(() -> "Publishing statistics through MUC: " + stats);
 
             clientConnectionImpl
                 .setPresenceExtension(Statistics.toXmppExtensionElement(stats));

diff --git a/src/main/java/org/jitsi/videobridge/stats/PubSubStatsTransport.java b/src/main/java/org/jitsi/videobridge/stats/PubSubStatsTransport.java
@@ -19,7 +19,7 @@
 
 import org.jitsi.videobridge.pubsub.*;
 import org.jitsi.videobridge.xmpp.*;
-import org.jitsi.utils.logging.*;
+import org.jitsi.utils.logging2.*;
 import org.jivesoftware.smack.packet.*;
 import org.jxmpp.jid.*;
 import org.osgi.framework.*;
@@ -39,7 +39,7 @@ public class PubSubStatsTransport
      * its instances to print debug information.
      */
     private static final Logger logger
-        = Logger.getLogger(PubSubStatsTransport.class);
+        = new LoggerImpl(PubSubStatsTransport.class.getName());
 
     /**
      * The ID of PubSub item which stores bridge statistics.
@@ -318,7 +318,7 @@ private void serviceChanged(ServiceEvent ev)
                 catch ( IllegalArgumentException
                         | IllegalStateException | SecurityException ex )
                 {
-                    logger.debug( "An unexpected exception occurred.", ex );
+                    logger.debug(() -> "An unexpected exception occurred: " + ex.toString());
                 }
                 if (service instanceof ComponentImpl)
                 {

diff --git a/src/main/java/org/jitsi/videobridge/stats/Statistics.java b/src/main/java/org/jitsi/videobridge/stats/Statistics.java
@@ -19,7 +19,7 @@
 import java.util.concurrent.atomic.*;
 import java.util.concurrent.locks.*;
 
-import org.jitsi.utils.logging.*;
+import org.jitsi.utils.logging2.*;
 import org.jitsi.xmpp.extensions.colibri.*;
 
 /**
@@ -34,7 +34,7 @@ public abstract class Statistics
      * The {@link Logger} used by the {@link Endpoint} class to print debug
      * information.
      */
-    private static final Logger logger = Logger.getLogger(Statistics.class);
+    private static final Logger logger = new LoggerImpl(Statistics.class.getName());
 
     /**
      * Formats statistics in <tt>ColibriStatsExtension</tt> object

diff --git a/src/main/java/org/jitsi/videobridge/stats/StatsManagerBundleActivator.java b/src/main/java/org/jitsi/videobridge/stats/StatsManagerBundleActivator.java
@@ -18,7 +18,7 @@
 import org.jitsi.osgi.*;
 import org.jitsi.service.configuration.*;
 import org.jitsi.util.*;
-import org.jitsi.utils.logging.*;
+import org.jitsi.utils.logging2.*;
 import org.jxmpp.jid.*;
 import org.jxmpp.jid.impl.*;
 import org.jxmpp.stringprep.*;
@@ -67,7 +67,7 @@ public class StatsManagerBundleActivator
      * class and its instances to print debug information.
      */
     private static final Logger logger
-        = Logger.getLogger(StatsManagerBundleActivator.class);
+        = new LoggerImpl(StatsManagerBundleActivator.class.getName());
 
     /**
      * The name of the property which specifies the name of the PubSub node that

diff --git a/src/main/java/org/jitsi/videobridge/transport/Harvesters.java b/src/main/java/org/jitsi/videobridge/transport/Harvesters.java
@@ -18,7 +18,7 @@
 
 import org.ice4j.ice.harvest.*;
 import org.jitsi.service.configuration.*;
-import org.jitsi.utils.logging.*;
+import org.jitsi.utils.logging2.*;
 
 import java.io.*;
 import java.util.*;
@@ -70,7 +70,7 @@ public class Harvesters
      * print debug information.
      */
     private static final Logger classLogger
-            = Logger.getLogger(Harvesters.class);
+            = new LoggerImpl(Harvesters.class.getName());
 
     /**
      * The default port that the <tt>TcpHarvester</tt> will

diff --git a/src/main/java/org/jitsi/videobridge/xmpp/ClientConnectionImpl.java b/src/main/java/org/jitsi/videobridge/xmpp/ClientConnectionImpl.java
@@ -17,6 +17,7 @@
 
 import org.jitsi.osgi.*;
 import org.jitsi.service.configuration.*;
+import org.jitsi.utils.logging2.*;
 import org.jitsi.xmpp.extensions.colibri.*;
 import org.jitsi.xmpp.extensions.health.*;
 import org.jitsi.xmpp.mucclient.*;
@@ -38,8 +39,8 @@ public class ClientConnectionImpl
      * The {@link Logger} used by the {@link ClientConnectionImpl}
      * class and its instances for logging output.
      */
-    private static final org.jitsi.utils.logging.Logger logger
-        =  org.jitsi.utils.logging.Logger.getLogger(ClientConnectionImpl.class);
+    private static final Logger logger
+        =  new LoggerImpl(ClientConnectionImpl.class.getName());
 
     /**
      * The prefix of the property names used to configure this bundle.

diff --git a/src/main/java/org/jitsi/videobridge/xmpp/ComponentImpl.java b/src/main/java/org/jitsi/videobridge/xmpp/ComponentImpl.java
@@ -20,6 +20,7 @@
 import org.jitsi.meet.*;
 import org.jitsi.osgi.*;
 import org.jitsi.service.configuration.*;
+import org.jitsi.utils.logging2.*;
 import org.jitsi.videobridge.Videobridge;
 import org.jitsi.xmpp.component.*;
 import org.jitsi.xmpp.util.*;
@@ -47,8 +48,8 @@ public class ComponentImpl
      * The {@link Logger} used by the {@link ComponentImpl} class and its
      * instances for logging output.
      */
-    private static final org.jitsi.utils.logging.Logger logger
-            =  org.jitsi.utils.logging.Logger.getLogger(ComponentImpl.class);
+    private static final Logger logger
+            =  new LoggerImpl(ComponentImpl.class.getName());
 
     /**
      * The (default) description of <tt>ComponentImpl</tt> instances.
@@ -382,10 +383,7 @@ public void send(org.jivesoftware.smack.packet.IQ iq)
 
             send(packet);
 
-            if (logger.isDebugEnabled())
-            {
-                logger.debug("SENT: " + packet.toXML());
-            }
+            logger.debug(() -> "SENT: " + packet.toXML());
         }
         catch (Exception e)
         {

diff --git a/src/main/java/org/jitsi/videobridge/xmpp/XmppCommon.java b/src/main/java/org/jitsi/videobridge/xmpp/XmppCommon.java
@@ -16,6 +16,7 @@
 package org.jitsi.videobridge.xmpp;
 
 import org.jitsi.osgi.*;
+import org.jitsi.utils.logging2.*;
 import org.jitsi.utils.version.*;
 import org.jitsi.videobridge.*;
 import org.jitsi.xmpp.extensions.colibri.*;
@@ -39,8 +40,8 @@ class XmppCommon
      * The {@link Logger} used by the {@link XmppCommon} class and its
      * instances for logging output.
      */
-    private static final org.jitsi.utils.logging.Logger logger
-        =  org.jitsi.utils.logging.Logger.getLogger(XmppCommon.class);
+    private static final Logger logger
+        =  new LoggerImpl(XmppCommon.class.getName());
 
     static final String[] FEATURES
         = new String[]
@@ -120,16 +121,16 @@ private VersionService getVersionService()
      */
     IQ handleIQ(IQ requestIQ)
     {
-        if (logger.isDebugEnabled() && requestIQ != null)
+        if (requestIQ != null)
         {
-            logger.debug("RECV: " + requestIQ.toXML());
+            logger.debug(() -> "RECV: " + requestIQ.toXML());
         }
 
         IQ replyIQ = handleIQInternal(requestIQ);
 
-        if (logger.isDebugEnabled() && replyIQ != null)
+        if (replyIQ != null)
         {
-            logger.debug("SENT: " + replyIQ.toXML());
+            logger.debug(() -> "SENT: " + replyIQ.toXML());
         }
 
         return replyIQ;