Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Disables octo by default (sync with the bridge). #712

Merged
merged 2 commits into from Mar 25, 2021
Merged

fix: Disables octo by default (sync with the bridge). #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c402d0
fix: Disables octo by default (sync with the bridge).
gpolitis Mar 25, 2021
08c9850
ref: Adjusts the tests.
gpolitis Mar 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/resources/reference.conf
View file
Open in desktop
Expand Up @@ -216,8 +216,10 @@ jicofo {

octo {
// Whether or not to use Octo. Note that when enabled, its use will be determined by
// $jicofo.bridge.selection-strategy.
enabled = true
// $jicofo.bridge.selection-strategy. There's a corresponding flag in the JVB and these
// two MUST be in sync (otherwise bridges will crash because they won't know how to
// deal with octo channels).
enabled = false

// An identifier of the Jicofo instance, used for the purpose of generating conference IDs unique across a set of
// Jicofo instances. Valid values are [1, 65535]. The value 0 is used when none is explicitly configured.
Expand Down
10 changes: 9 additions & 1 deletion src/test/kotlin/org/jitsi/jicofo/OctoConfigTest.kt
View file
Open in desktop
Expand Up @@ -20,14 +20,22 @@ import io.kotest.matchers.shouldBe
class OctoConfigTest : ConfigTest() {
init {
context("Enabled flag") {
// Note that there's a corresponding flag in the JVB and these two
// MUST be in sync (otherwise bridges will crash because they won't
// know how to deal with octo channels).
context("default") {
OctoConfig.config.enabled shouldBe true
OctoConfig.config.enabled shouldBe false
}
context("disabled") {
withNewConfig("jicofo.octo.enabled=false") {
OctoConfig.config.enabled shouldBe false
}
}
context("enabled") {
withNewConfig("jicofo.octo.enabled=true") {
OctoConfig.config.enabled shouldBe true
}
}
}
context("ID") {
context("default") {
Expand Down