BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: remove akka-bbb-transcode leftovers

Browse Source 
Follow up to the cleanup done in 143d9bbe87
This commit is contained in:
prlanzarin 2022-06-29 13:28:33 +00:00
parent 61b269eca8
commit a8c689c8c3
4 changed files with 0 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
View File

@ -70,11 +70,6 @@ trait SystemConfiguration {
lazy val fromBbbWebRedisChannel = Try(config.getString("redis.fromBbbWebRedisChannel")).getOrElse("from-bbb-web-redis-channel") lazy val fromBbbWebRedisChannel = Try(config.getString("redis.fromBbbWebRedisChannel")).getOrElse("from-bbb-web-redis-channel")
lazy val toAkkaTranscodeRedisChannel = Try(config.getString("redis.toAkkaTranscodeRedisChannel")).getOrElse("bigbluebutton:to-bbb-transcode:system")
lazy val fromAkkaTranscodeRedisChannel = Try(config.getString("redis.fromAkkaTranscodeRedisChannel")).getOrElse("bigbluebutton:from-bbb-transcode:system")
lazy val toAkkaTranscodeJsonChannel = Try(config.getString("eventBus.toAkkaTranscodeJsonChannel")).getOrElse("to-akka-transcode-json-channel")
lazy val fromAkkaTranscodeJsonChannel = Try(config.getString("eventBus.fromAkkaTranscodeJsonChannel")).getOrElse("from-akka-transcode-json-channel")
lazy val analyticsIncludeChat = Try(config.getBoolean("analytics.includeChat")).getOrElse(true) lazy val analyticsIncludeChat = Try(config.getBoolean("analytics.includeChat")).getOrElse(true)
// Grab the "interface" parameter from the http config // Grab the "interface" parameter from the http config

3
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
View File

@ -187,9 +187,6 @@ class BigBlueButtonActor(
val disconnectEvnt = MsgBuilder.buildDisconnectAllClientsSysMsg(msg.meetingId, "meeting-destroyed") val disconnectEvnt = MsgBuilder.buildDisconnectAllClientsSysMsg(msg.meetingId, "meeting-destroyed")
m2.outMsgRouter.send(disconnectEvnt) m2.outMsgRouter.send(disconnectEvnt)
val stopTranscodersCmd = MsgBuilder.buildStopMeetingTranscodersSysCmdMsg(msg.meetingId)
m2.outMsgRouter.send(stopTranscodersCmd)
log.info("Destroyed meetingId={}", msg.meetingId) log.info("Destroyed meetingId={}", msg.meetingId)
val destroyedEvent = MsgBuilder.buildMeetingDestroyedEvtMsg(msg.meetingId) val destroyedEvent = MsgBuilder.buildMeetingDestroyedEvtMsg(msg.meetingId)
m2.outMsgRouter.send(destroyedEvent) m2.outMsgRouter.send(destroyedEvent)

10
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/MsgBuilder.scala
View File

@ -347,16 +347,6 @@ object MsgBuilder {
BbbCommonEnvCoreMsg(envelope, event) BbbCommonEnvCoreMsg(envelope, event)
} }
def buildStopMeetingTranscodersSysCmdMsg(meetingId: String): BbbCommonEnvCoreMsg = {
val routing = collection.immutable.HashMap("sender" -> "bbb-apps-akka")
val envelope = BbbCoreEnvelope(StopMeetingTranscodersSysCmdMsg.NAME, routing)
val body = StopMeetingTranscodersSysCmdMsgBody()
val header = BbbCoreHeaderWithMeetingId(StopMeetingTranscodersSysCmdMsg.NAME, meetingId)
val event = StopMeetingTranscodersSysCmdMsg(header, body)
BbbCommonEnvCoreMsg(envelope, event)
}
def buildRecordingChapterBreakSysMsg(meetingId: String, timestamp: Long): BbbCommonEnvCoreMsg = { def buildRecordingChapterBreakSysMsg(meetingId: String, timestamp: Long): BbbCommonEnvCoreMsg = {
val routing = collection.immutable.HashMap("sender" -> "bbb-apps-akka") val routing = collection.immutable.HashMap("sender" -> "bbb-apps-akka")
val envelope = BbbCoreEnvelope(RecordingChapterBreakSysMsg.NAME, routing) val envelope = BbbCoreEnvelope(RecordingChapterBreakSysMsg.NAME, routing)

43
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/TranscoderMsgs.scala
View File

@ -1,43 +0,0 @@
package org.bigbluebutton.common2.msgs
/* In Messages */
object StartProbingSysReqMsg { val NAME = "StartProbingSysReqMsg" }
case class StartProbingSysReqMsg(header: BbbCoreHeaderWithMeetingId, body: StartProbingSysReqMsgBody) extends BbbCoreMsg
case class StartProbingSysReqMsgBody(transcoderId: String, params: Map[String, String])
object StartTranscoderSysReqMsg { val NAME = "StartTranscoderSysReqMsg" }
case class StartTranscoderSysReqMsg(header: BbbCoreHeaderWithMeetingId, body: StartTranscoderSysReqMsgBody) extends BbbCoreMsg
case class StartTranscoderSysReqMsgBody(transcoderId: String, params: Map[String, String])
object StopTranscoderSysReqMsg { val NAME = "StopTranscoderSysReqMsg" }
case class StopTranscoderSysReqMsg(header: BbbCoreHeaderWithMeetingId, body: StopTranscoderSysReqMsgBody) extends BbbCoreMsg
case class StopTranscoderSysReqMsgBody(transcoderId: String)
object UpdateTranscoderSysReqMsg { val NAME = "UpdateTranscoderSysReqMsg" }
case class UpdateTranscoderSysReqMsg(header: BbbCoreHeaderWithMeetingId, body: UpdateTranscoderSysReqMsgBody) extends BbbCoreMsg
case class UpdateTranscoderSysReqMsgBody(transcoderId: String, params: Map[String, String])
object TranscoderStatusUpdateSysCmdMsg { val NAME = "TranscoderStatusUpdateSysCmdMsg" }
case class TranscoderStatusUpdateSysCmdMsg(header: BbbCoreHeaderWithMeetingId, body: TranscoderStatusUpdateSysCmdMsgBody) extends BbbCoreMsg
case class TranscoderStatusUpdateSysCmdMsgBody(transcoderId: String, params: Map[String, String])
object StopMeetingTranscodersSysCmdMsg { val NAME = "StopMeetingTranscodersSysCmdMsg" }
case class StopMeetingTranscodersSysCmdMsg(header: BbbCoreHeaderWithMeetingId, body: StopMeetingTranscodersSysCmdMsgBody) extends BbbCoreMsg
case class StopMeetingTranscodersSysCmdMsgBody()
/* Out Messages */
object StartProbingSysRespMsg { val NAME = "StartProbingSysRespMsg" }
case class StartProbingSysRespMsg(header: BbbCoreHeaderWithMeetingId, body: StartProbingSysRespMsgBody) extends BbbCoreMsg
case class StartProbingSysRespMsgBody(transcoderId: String, params: Map[String, String])
object StartTranscoderSysRespMsg { val NAME = "StartTranscoderSysRespMsg" }
case class StartTranscoderSysRespMsg(header: BbbCoreHeaderWithMeetingId, body: StartTranscoderSysRespMsgBody) extends BbbCoreMsg
case class StartTranscoderSysRespMsgBody(transcoderId: String, params: Map[String, String])
object StopTranscoderSysRespMsg { val NAME = "StopTranscoderSysRespMsg" }
case class StopTranscoderSysRespMsg(header: BbbCoreHeaderWithMeetingId, body: StopTranscoderSysRespMsgBody) extends BbbCoreMsg
case class StopTranscoderSysRespMsgBody(transcoderId: String)
object UpdateTranscoderSysRespMsg { val NAME = "UpdateTranscoderSysRespMsg" }
case class UpdateTranscoderSysRespMsg(header: BbbCoreHeaderWithMeetingId, body: UpdateTranscoderSysRespMsgBody) extends BbbCoreMsg
case class UpdateTranscoderSysRespMsgBody(transcoderId: String, params: Map[String, String])