feat: Add option to disable jvb version match. (#911)

jitsi · Apr 27, 2022 · 7bb3798 · 7bb3798
1 parent 30c605e
commit 7bb3798
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/main/kotlin/org/jitsi/jicofo/OctoConfig.kt b/src/main/kotlin/org/jitsi/jicofo/OctoConfig.kt
@@ -25,6 +25,10 @@ class OctoConfig {
         "jicofo.octo.enabled".from(newConfig)
     }
 
+    val allowMixedVersions: Boolean by config {
+        "jicofo.octo.allow-mixed-versions".from(newConfig)
+    }
+
     companion object {
         @JvmField
         val config = OctoConfig()

diff --git a/src/main/kotlin/org/jitsi/jicofo/bridge/BridgeSelector.kt b/src/main/kotlin/org/jitsi/jicofo/bridge/BridgeSelector.kt
@@ -181,7 +181,7 @@ class BridgeSelector @JvmOverloads constructor(
             return null
         }
 
-        if (v != null) {
+        if (v != null && !OctoConfig.config.allowMixedVersions) {
             candidateBridges = candidateBridges.filter { it.version == v }
             if (candidateBridges.isEmpty()) {
                 logger.warn("There are no bridges with the required version: $v")

diff --git a/src/main/resources/reference.conf b/src/main/resources/reference.conf
@@ -281,6 +281,9 @@ jicofo {
     // two MUST be in sync (otherwise bridges will crash because they won't know how to
     // deal with octo channels).
     enabled = false
+
+    // Whether to allow bridges with different versions to be used in the same conference. Intended only for testing.
+    allow-mixed-versions = false
   }
 
   rest {