Merge branch 'master' into fixes

Author: bgrozev

pom.xml

@@ -20,7 +20,7 @@
   <properties>
     <assembly.skipAssembly>true</assembly.skipAssembly>
     <exec.mainClass>org.jitsi.videobridge.Main</exec.mainClass>
-    <jitsi-desktop.version>2.13.f0a8003</jitsi-desktop.version>
+    <jitsi-desktop.version>2.13.389bc25</jitsi-desktop.version>
     <smack.version>4.2.2-b1c107f</smack.version>
   </properties>
 

src/main/java/org/jitsi/videobridge/IceUdpTransportManager.java

@@ -38,6 +38,7 @@
 import org.jitsi.service.neomedia.*;
 import org.jitsi.util.*;
 import org.jitsi.util.Logger;
+import org.jitsi.videobridge.health.*;
 import org.jitsi.videobridge.rest.*;
 import org.osgi.framework.*;
 
@@ -1795,6 +1796,16 @@ else if (transport == Transport.UDP)
         getChannels().forEach(Channel::transportConnected);
     }
 
+    /**
+     * The name of the property which controls whether health checks failures
+     * should be permanent. If this is set to true and the bridge fails its
+     * health check once, it will not go back to the healthy state.
+     */
+    private static final String PERMANENT_FAILURE_PNAME
+        = Health.class.getName() + ".PERMANENT_FAILURE";
+
+    private static BundleContext bundleContext = null;
+    private static boolean permanentFailureMode = false;
     /**
      * @return the {@link Transport} (e.g. UDP or TCP) of the selected pair
      * of this {@link IceUdpTransportManager}. If the transport manager is

src/main/java/org/jitsi/videobridge/Videobridge.java

@@ -218,6 +218,12 @@ public static Collection<Videobridge> getVideobridges(
      */
     private VideobridgeExpireThread videobridgeExpireThread;
 
+    /**
+     * The {@link Health} instance responsible for periodically performing
+     * health checks on this videobridge.
+     */
+    private Health health;
+
     /**
      * Initializes a new <tt>Videobridge</tt> instance.
      */
@@ -1210,12 +1216,13 @@ public IQ handleHealthCheckIQ(HealthCheckIQ healthCheckIQ)
 
         try
         {
-            Health.check(this);
+            healthCheck();
 
             return IQ.createResultIQ(healthCheckIQ);
         }
         catch (Exception e)
         {
+            e.printStackTrace();
             return
                 IQUtils.createError(
                         healthCheckIQ,
@@ -1224,6 +1231,27 @@ public IQ handleHealthCheckIQ(HealthCheckIQ healthCheckIQ)
         }
     }
 
+    /**
+     * Checks the health of this {@link Videobridge}. If it is healthy it just
+     * returns silently, otherwise it throws an exception. Note that this
+     * method does not perform any tests, but only checks the cached value
+     * provided by the bridge's {@link Health} instance.
+     *
+     * @throws Exception if the videobridge is not healthy.
+     */
+    public void healthCheck()
+        throws Exception
+    {
+        if (health == null)
+        {
+            throw new Exception("No health checks running");
+        }
+        else
+        {
+            health.check();
+        }
+    }
+
     /**
      * Handles a <tt>GracefulShutdownIQ</tt> stanza which represents a request.
      *
@@ -1309,7 +1337,9 @@ public boolean isXmppApiEnabled()
             = ServiceUtils.getService(
                 getBundleContext(), ConfigurationService.class);
 
-        return config.getBoolean(Videobridge.XMPP_API_PNAME, false);
+        // The XMPP API is disabled by default.
+        return config != null &&
+            config.getBoolean(Videobridge.XMPP_API_PNAME, false);
     }
 
     /**
@@ -1382,7 +1412,11 @@ void start(final BundleContext bundleContext)
                     ConfigurationService.class);
 
         videobridgeExpireThread.start(bundleContext);
-        Health.start(this);
+        if (health != null)
+        {
+            health.stop();
+        }
+        health = new Health(this, cfg);
 
         defaultProcessingOptions
             = (cfg == null)
@@ -1611,9 +1645,14 @@ private void startIce4j(
     void stop(BundleContext bundleContext)
         throws Exception
     {
-        Health.stop(this);
         try
         {
+            if (health != null)
+            {
+                health.stop();
+                health = null;
+            }
+
             ConfigurationService cfg
                 = ServiceUtils2.getService(
                     bundleContext,