@@ -22,7 +22,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
2222import org.jitsi.jicofo.OctoConfig
2323import org.jitsi.jicofo.TaskPools
2424import org.jitsi.jicofo.bridge.Bridge
25- import org.jitsi.jicofo.bridge.BridgeConfig
25+ import org.jitsi.jicofo.bridge.BridgeConfig.Companion.config
2626import org.jitsi.jicofo.bridge.BridgeSelector
2727import org.jitsi.jicofo.bridge.Cascade
2828import org.jitsi.jicofo.bridge.CascadeRepair
@@ -76,10 +76,6 @@ class ColibriV2SessionManager(
7676 override fun addListener (listener : ColibriSessionManager .Listener ) = eventEmitter.addHandler(listener)
7777 override fun removeListener (listener : ColibriSessionManager .Listener ) = eventEmitter.removeHandler(listener)
7878
79- private val topologySelectionStrategy = BridgeConfig .config.topologyStrategy.also {
80- logger.info(" Using ${it.javaClass.name} " )
81- }
82-
8379 /* *
8480 * The colibri2 sessions that are currently active, mapped by the relayId of the [Bridge] that they use.
8581 */
@@ -124,14 +120,14 @@ class ColibriV2SessionManager(
124120 logger.debug { " Asked to remove $participantId " }
125121
126122 participants[participantId]?.let {
127- logger.info (" Removing ${it.id} " )
123+ logger.debug (" Removing ${it.id} " )
128124 removeParticipantInfosBySession(mapOf (it.session to singletonList(it)))
129125 } ? : logger.warn(" Can not remove $participantId , no participantInfo" )
130126 Unit
131127 }
132128
133129 private fun repairMesh (cascade : ColibriV2SessionManager , disconnectedMeshes : Set <Set <Colibri2Session >>) =
134- topologySelectionStrategy .repairMesh(cascade, disconnectedMeshes)
130+ config.topologyStrategy .repairMesh(cascade, disconnectedMeshes)
135131
136132 private fun removeSession (session : Colibri2Session ): Set <ParticipantInfo > {
137133 val participants = getSessionParticipants(session)
@@ -327,7 +323,7 @@ class ColibriV2SessionManager(
327323 created = it.second
328324 }
329325 logger.info(
330- " Selected ${bridge.jid.resourceOrNull} for $$ {participant.id} " +
326+ " Selected ${bridge.jid.resourceOrNull} for ${participant.id} " +
331327 " (visitor=${participant.visitor} , session exists: ${! created} )"
332328 )
333329 if (visitor != session.visitor) {
@@ -341,7 +337,7 @@ class ColibriV2SessionManager(
341337 stanzaCollector = session.sendAllocationRequest(participantInfo)
342338 add(participantInfo)
343339 if (created) {
344- val topologySelectionResult = topologySelectionStrategy .connectNode(
340+ val topologySelectionResult = config.topologyStrategy .connectNode(
345341 this ,
346342 session
347343 )
@@ -560,7 +556,7 @@ class ColibriV2SessionManager(
560556 initialLastN : InitialLastN ? ,
561557 suppressLocalBridgeUpdate : Boolean
562558 ) = synchronized(syncRoot) {
563- logger.info (" Updating $participantId with transport=$transport , sources=$sources " )
559+ logger.debug (" Updating $participantId with transport=$transport , sources=$sources " )
564560
565561 val participantInfo = participants[participantId]
566562 ? : run {
0 commit comments