diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
index ef8ce3d799dcab40432c41227f6ac9b0f21ec118..b25a6170ffe6e0eb75bc1f57058aa20fbe1b2315 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
@@ -23,16 +23,14 @@ object BigBlueButtonActor extends SystemConfiguration {
system: ActorSystem,
eventBus: InternalEventBus,
bbbMsgBus: BbbMsgRouterEventBus,
- outGW: OutMessageGateway
- ): Props =
+ outGW: OutMessageGateway): Props =
Props(classOf[BigBlueButtonActor], system, eventBus, bbbMsgBus, outGW)
}
class BigBlueButtonActor(
val system: ActorSystem,
val eventBus: InternalEventBus, val bbbMsgBus: BbbMsgRouterEventBus,
- val outGW: OutMessageGateway
-) extends Actor
+ val outGW: OutMessageGateway) extends Actor
with ActorLogging with SystemConfiguration {
implicit def executionContext = system.dispatcher
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/OutMessageGatewayImp.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/OutMessageGatewayImp.scala
index 610bc3a04e51ae048fc01dccded518fef890af67..293aa470f4aa0c42e457d46692749be618f845fc 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/OutMessageGatewayImp.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/OutMessageGatewayImp.scala
@@ -6,14 +6,12 @@ import org.bigbluebutton.core.bus._
object OutMessageGatewayImp {
def apply(
- outBus2: OutEventBus2
- ) =
+ outBus2: OutEventBus2) =
new OutMessageGatewayImp(outBus2)
}
class OutMessageGatewayImp(
- outBus2: OutEventBus2
-) extends OutMessageGateway
+ outBus2: OutEventBus2) extends OutMessageGateway
with SystemConfiguration {
def send(msg: BbbCommonEnvCoreMsg): Unit = {
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutModel.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutModel.scala
index e6d0ba5bd538bbfe5934e7af0f6beb90ee7e3cba..0ec4ff29cddfc796efd7356111a34fad56c12256 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutModel.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutModel.scala
@@ -11,18 +11,16 @@ object BreakoutModel {
sequence: Integer,
freeJoin: Boolean,
voiceConf: String,
- assignedUsers: Vector[String]
- ): BreakoutRoom2x = {
+ assignedUsers: Vector[String]): BreakoutRoom2x = {
new BreakoutRoom2x(id, externalId, name, parentId, sequence, freeJoin, voiceConf, assignedUsers, Vector(), Vector(), None, false)
}
}
case class BreakoutModel(
- startedOn: Option[Long],
- durationInMinutes: Int,
- rooms: Map[String, BreakoutRoom2x]
-) {
+ startedOn: Option[Long],
+ durationInMinutes: Int,
+ rooms: Map[String, BreakoutRoom2x]) {
def find(id: String): Option[BreakoutRoom2x] = {
rooms.get(id)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/BreakoutApp2x.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/BreakoutApp2x.scala
index 01e7d9f974139076d80c30929c9fc35f730a00c3..f9a610cc757295634bef84f1b7f3a3d3ff95fe1a 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/BreakoutApp2x.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/BreakoutApp2x.scala
@@ -57,8 +57,7 @@ object BreakoutRoomsUtil {
"isBreakout" -> urlEncode(isBreakout.toString()),
"meetingID" -> urlEncode(breakoutMeetingId),
"password" -> urlEncode(password),
- "redirect" -> urlEncode("true")
- )
+ "redirect" -> urlEncode("true"))
(params, params + ("joinViaHtml5" -> urlEncode("true")))
}
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/BreakoutHdlrHelpers.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/BreakoutHdlrHelpers.scala
index a51591fa59cf375c31e615e08a55456379fbeaa6..805bf86f871fd420ac9540fdef12fb154342598d 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/BreakoutHdlrHelpers.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/BreakoutHdlrHelpers.scala
@@ -63,7 +63,6 @@ trait BreakoutHdlrHelpers extends SystemConfiguration {
eventBus.publish(BigBlueButtonEvent(
liveMeeting.props.breakoutProps.parentId,
new BreakoutRoomUsersUpdateInternalMsg(liveMeeting.props.breakoutProps.parentId, liveMeeting.props.meetingProp.intId,
- breakoutUsers, breakoutVoiceUsers)
- ))
+ breakoutUsers, breakoutVoiceUsers)))
}
}
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/BreakoutRoomCreatedMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/BreakoutRoomCreatedMsgHdlr.scala
index cccb9fa0f69c261f4775f039f317113ab4dcb893..e6725a0c3dc8471b2b9d6ac0b00cac78d1a94042 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/BreakoutRoomCreatedMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/BreakoutRoomCreatedMsgHdlr.scala
@@ -78,8 +78,7 @@ trait BreakoutRoomCreatedMsgHdlr extends BreakoutHdlrHelpers {
def build(meetingId: String, breakout: BreakoutRoomInfo): BbbCommonEnvCoreMsg = {
val routing = Routing.addMsgToClientRouting(
MessageTypes.BROADCAST_TO_MEETING,
- liveMeeting.props.meetingProp.intId, "not-used"
- )
+ liveMeeting.props.meetingProp.intId, "not-used")
val envelope = BbbCoreEnvelope(BreakoutRoomStartedEvtMsg.NAME, routing)
val header = BbbClientMsgHeader(BreakoutRoomStartedEvtMsg.NAME, liveMeeting.props.meetingProp.intId, "not-used")
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/CreateBreakoutRoomsCmdMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/CreateBreakoutRoomsCmdMsgHdlr.scala
index 18b9434be3324643e1163bd786bd8536b97702b1..e4e4da045a51cb46250b7601fcf01bf1b8ce9154 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/CreateBreakoutRoomsCmdMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/breakout/CreateBreakoutRoomsCmdMsgHdlr.scala
@@ -24,8 +24,7 @@ trait CreateBreakoutRoomsCmdMsgHdlr extends RightsManagementTrait {
state.breakout match {
case Some(breakout) =>
log.warning(
- "CreateBreakoutRooms event received while breakout created for meeting {}", liveMeeting.props.meetingProp.intId
- )
+ "CreateBreakoutRooms event received while breakout created for meeting {}", liveMeeting.props.meetingProp.intId)
state
case None =>
processRequest(msg, state)
@@ -60,8 +59,7 @@ trait CreateBreakoutRoomsCmdMsgHdlr extends RightsManagementTrait {
msg.body.durationInMinutes,
liveMeeting.props.password.moderatorPass,
liveMeeting.props.password.viewerPass,
- presId, presSlide, msg.body.record
- )
+ presId, presSlide, msg.body.record)
val event = buildCreateBreakoutRoomSysCmdMsg(liveMeeting.props.meetingProp.intId, roomDetail)
outGW.send(event)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/CaptionApp2x.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/CaptionApp2x.scala
index c7351ca4f2d3ed7389863066efe18d144d64b7c4..7ab747a35cf66f38ace8346906a88a441afa11be 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/CaptionApp2x.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/caption/CaptionApp2x.scala
@@ -34,8 +34,7 @@ class CaptionApp2x(implicit val context: ActorContext) extends RightsManagementT
def broadcastEvent(msg: EditCaptionHistoryPubMsg): Unit = {
val routing = Routing.addMsgToClientRouting(
MessageTypes.BROADCAST_TO_MEETING,
- liveMeeting.props.meetingProp.intId, msg.header.userId
- )
+ liveMeeting.props.meetingProp.intId, msg.header.userId)
val envelope = BbbCoreEnvelope(EditCaptionHistoryEvtMsg.NAME, routing)
val header = BbbClientMsgHeader(EditCaptionHistoryEvtMsg.NAME, liveMeeting.props.meetingProp.intId, msg.header.userId)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/groupchats/CreateDefaultPublicGroupChat.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/groupchats/CreateDefaultPublicGroupChat.scala
index 31bac464d246e0e8b04b88e453b8330ea88bbc02..7bdc79279e3a215a5342fa365b0c8f5ffd30465f 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/groupchats/CreateDefaultPublicGroupChat.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/groupchats/CreateDefaultPublicGroupChat.scala
@@ -28,8 +28,7 @@ trait CreateDefaultPublicGroupChat {
val respMsg = buildGroupChatCreatedEvtMsg(
liveMeeting.props.meetingProp.intId,
SystemUser.ID,
- groupChat
- )
+ groupChat)
bus.outGW.send(respMsg)
val groupChats = state.groupChats.add(groupChat)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/groupchats/GetGroupChatMsgsReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/groupchats/GetGroupChatMsgsReqMsgHdlr.scala
index 772d2359c4a220c189e684b8e8c35810d7807fe5..2275589db936ea97d957f8e5d6eae36131724701 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/groupchats/GetGroupChatMsgsReqMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/groupchats/GetGroupChatMsgsReqMsgHdlr.scala
@@ -27,8 +27,7 @@ trait GetGroupChatMsgsReqMsgHdlr {
m.sender, m.color, m.message))
val respMsg = buildGetGroupChatMsgsRespMsg(
liveMeeting.props.meetingProp.intId,
- msg.header.userId, msgs, gc.id
- )
+ msg.header.userId, msgs, gc.id)
bus.outGW.send(respMsg)
}
}
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/groupchats/SendGroupChatMessageMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/groupchats/SendGroupChatMessageMsgHdlr.scala
index 596bf7eb26b87f6f82687bcd217cc8cb7e113cd9..09221ea54a3e82bab496dc030d24371a982258d2 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/groupchats/SendGroupChatMessageMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/groupchats/SendGroupChatMessageMsgHdlr.scala
@@ -88,8 +88,7 @@ trait SendGroupChatMessageMsgHdlr {
val event = buildGroupChatMessageBroadcastEvtMsg(
liveMeeting.props.meetingProp.intId,
- msg.header.userId, msg.body.chatId, gcm
- )
+ msg.header.userId, msg.body.chatId, gcm)
bus.outGW.send(event)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/layout/BroadcastLayoutMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/layout/BroadcastLayoutMsgHdlr.scala
index 1ee2cc3027f15e21102ee7e0efa1886229c86993..66d337d38ef81187c734304313893fca2509f71f 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/layout/BroadcastLayoutMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/layout/BroadcastLayoutMsgHdlr.scala
@@ -31,8 +31,7 @@ trait BroadcastLayoutMsgHdlr extends RightsManagementTrait {
val body = BroadcastLayoutEvtMsgBody(
Layouts.getCurrentLayout(liveMeeting.layouts),
MeetingStatus2x.getPermissions(liveMeeting.status).lockedLayout,
- Layouts.getLayoutSetter(liveMeeting.layouts), affectedUsers
- )
+ Layouts.getLayoutSetter(liveMeeting.layouts), affectedUsers)
val event = BroadcastLayoutEvtMsg(header, body)
val msgEvent = BbbCommonEnvCoreMsg(envelope, event)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/layout/GetCurrentLayoutReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/layout/GetCurrentLayoutReqMsgHdlr.scala
index 22616e3afbf447019ffb6709b9d299c25d64caec..56d27c80757e80a6bccee85053cf99920029db40 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/layout/GetCurrentLayoutReqMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/layout/GetCurrentLayoutReqMsgHdlr.scala
@@ -22,8 +22,7 @@ trait GetCurrentLayoutReqMsgHdlr {
val body = GetCurrentLayoutRespMsgBody(
Layouts.getCurrentLayout(liveMeeting.layouts),
MeetingStatus2x.getPermissions(liveMeeting.status).lockedLayout,
- Layouts.getLayoutSetter(liveMeeting.layouts)
- )
+ Layouts.getLayoutSetter(liveMeeting.layouts))
val event = GetCurrentLayoutRespMsg(header, body)
val msgEvent = BbbCommonEnvCoreMsg(envelope, event)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/meeting/ValidateConnAuthTokenSysMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/meeting/ValidateConnAuthTokenSysMsgHdlr.scala
index e440fa2a6c63e37cd576d2973545716f10991e46..b8cc271115113066be694c571a98c63d1a699dda 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/meeting/ValidateConnAuthTokenSysMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/meeting/ValidateConnAuthTokenSysMsgHdlr.scala
@@ -13,8 +13,7 @@ trait ValidateConnAuthTokenSysMsgHdlr {
val regUser = RegisteredUsers.getRegisteredUserWithToken(
msg.body.authToken,
msg.body.userId,
- liveMeeting.registeredUsers
- )
+ liveMeeting.registeredUsers)
regUser match {
case Some(u) =>
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PreuploadedPresentationsPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PreuploadedPresentationsPubMsgHdlr.scala
index 1660db3586bcbd65445825627531fdb183df0f9e..a773b0662ab73c244a8f46f00ea619ba9560c7ad 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PreuploadedPresentationsPubMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PreuploadedPresentationsPubMsgHdlr.scala
@@ -11,8 +11,7 @@ trait PreuploadedPresentationsPubMsgHdlr {
def handle(
msg: PreuploadedPresentationsSysPubMsg,
- liveMeeting: LiveMeeting, bus: MessageBus
- ): Unit = {
+ liveMeeting: LiveMeeting, bus: MessageBus): Unit = {
val presos = new collection.mutable.HashMap[String, Presentation]
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/CreateDefaultPresentationPod.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/CreateDefaultPresentationPod.scala
index dfaacae59ad06dcbf80ee741b495d39d9270931b..4b2cd4e0d2c249cdc3043994077fc570b0e7dbdd 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/CreateDefaultPresentationPod.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/CreateDefaultPresentationPod.scala
@@ -17,8 +17,7 @@ trait CreateDefaultPresentationPod {
liveMeeting.props.meetingProp.intId,
resultPod.currentPresenter,
resultPod.id,
- SYSTEM_ID
- )
+ SYSTEM_ID)
bus.outGW.send(respMsg)
val pods = state.presentationPodManager.addPod(resultPod)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/CreateNewPresentationPodPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/CreateNewPresentationPodPubMsgHdlr.scala
index 90dc4bb949299e1c3e2345009ff17aaf54de4101..1c1f0ffa577f4917a7d48a7a1bcf213681af104c 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/CreateNewPresentationPodPubMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/CreateNewPresentationPodPubMsgHdlr.scala
@@ -16,8 +16,7 @@ trait CreateNewPresentationPodPubMsgHdlr extends RightsManagementTrait {
if (permissionFailed(
PermissionCheck.MOD_LEVEL,
- PermissionCheck.VIEWER_LEVEL, liveMeeting.users2x, msg.header.userId
- )) {
+ PermissionCheck.VIEWER_LEVEL, liveMeeting.users2x, msg.header.userId)) {
val meetingId = liveMeeting.props.meetingProp.intId
val reason = "No permission to create new presentation pod."
PermissionCheck.ejectUserForFailedPermission(meetingId, msg.header.userId, reason, bus.outGW, liveMeeting)
@@ -30,8 +29,7 @@ trait CreateNewPresentationPodPubMsgHdlr extends RightsManagementTrait {
liveMeeting.props.meetingProp.intId,
resultPod.currentPresenter,
resultPod.id,
- msg.header.userId
- )
+ msg.header.userId)
bus.outGW.send(respMsg)
val pods = state.presentationPodManager.addPod(resultPod)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationConversionCompletedSysPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationConversionCompletedSysPubMsgHdlr.scala
index 83f180254690018601b5f16a05d7fb9438004dc3..40b1b3bfd12397610286ca8f917d6669a6e7efba 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationConversionCompletedSysPubMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationConversionCompletedSysPubMsgHdlr.scala
@@ -13,8 +13,7 @@ trait PresentationConversionCompletedSysPubMsgHdlr {
def handle(
msg: PresentationConversionCompletedSysPubMsg, state: MeetingState2x,
- liveMeeting: LiveMeeting, bus: MessageBus
- ): MeetingState2x = {
+ liveMeeting: LiveMeeting, bus: MessageBus): MeetingState2x = {
val meetingId = liveMeeting.props.meetingProp.intId
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationConversionUpdatePubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationConversionUpdatePubMsgHdlr.scala
index a50462b3263cbbd6efd217ac4e066149efc0f431..b20ad1f753f1d4d5dfa994f11f90518dd82a0cea 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationConversionUpdatePubMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationConversionUpdatePubMsgHdlr.scala
@@ -14,13 +14,11 @@ trait PresentationConversionUpdatePubMsgHdlr {
def broadcastEvent(msg: PresentationConversionUpdateSysPubMsg): Unit = {
val routing = Routing.addMsgToClientRouting(
MessageTypes.BROADCAST_TO_MEETING,
- liveMeeting.props.meetingProp.intId, msg.header.userId
- )
+ liveMeeting.props.meetingProp.intId, msg.header.userId)
val envelope = BbbCoreEnvelope(PresentationConversionUpdateEvtMsg.NAME, routing)
val header = BbbClientMsgHeader(
PresentationConversionUpdateEvtMsg.NAME,
- liveMeeting.props.meetingProp.intId, msg.header.userId
- )
+ liveMeeting.props.meetingProp.intId, msg.header.userId)
val body = PresentationConversionUpdateEvtMsgBody(msg.body.podId, msg.body.messageKey,
msg.body.code, msg.body.presentationId, msg.body.presName)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationPageCountErrorPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationPageCountErrorPubMsgHdlr.scala
index b2e9f7a3cb8822026c12e828c3ec6ac3c339f698..d2ae1502496047fe505ce278adcaf89838b4a9ff 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationPageCountErrorPubMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationPageCountErrorPubMsgHdlr.scala
@@ -10,19 +10,16 @@ trait PresentationPageCountErrorPubMsgHdlr {
def handle(
msg: PresentationPageCountErrorSysPubMsg, state: MeetingState2x,
- liveMeeting: LiveMeeting, bus: MessageBus
- ): MeetingState2x = {
+ liveMeeting: LiveMeeting, bus: MessageBus): MeetingState2x = {
def broadcastEvent(msg: PresentationPageCountErrorSysPubMsg): Unit = {
val routing = Routing.addMsgToClientRouting(
MessageTypes.BROADCAST_TO_MEETING,
- liveMeeting.props.meetingProp.intId, msg.header.userId
- )
+ liveMeeting.props.meetingProp.intId, msg.header.userId)
val envelope = BbbCoreEnvelope(PresentationPageCountErrorEvtMsg.NAME, routing)
val header = BbbClientMsgHeader(
PresentationPageCountErrorEvtMsg.NAME,
- liveMeeting.props.meetingProp.intId, msg.header.userId
- )
+ liveMeeting.props.meetingProp.intId, msg.header.userId)
val body = PresentationPageCountErrorEvtMsgBody(msg.body.podId, msg.body.messageKey, msg.body.code, msg.body.presentationId, msg.body.numberOfPages, msg.body.maxNumberPages, msg.body.presName)
val event = PresentationPageCountErrorEvtMsg(header, body)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationPageGeneratedPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationPageGeneratedPubMsgHdlr.scala
index 751eddedfab6b2548a673034bc1ab2e9d4cb20b8..38780e84d96c0200edb0e49248c4a84d9df7b51f 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationPageGeneratedPubMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationPageGeneratedPubMsgHdlr.scala
@@ -14,13 +14,11 @@ trait PresentationPageGeneratedPubMsgHdlr {
def broadcastEvent(msg: PresentationPageGeneratedSysPubMsg): Unit = {
val routing = Routing.addMsgToClientRouting(
MessageTypes.BROADCAST_TO_MEETING,
- liveMeeting.props.meetingProp.intId, msg.header.userId
- )
+ liveMeeting.props.meetingProp.intId, msg.header.userId)
val envelope = BbbCoreEnvelope(PresentationPageGeneratedEvtMsg.NAME, routing)
val header = BbbClientMsgHeader(
PresentationPageGeneratedEvtMsg.NAME,
- liveMeeting.props.meetingProp.intId, msg.header.userId
- )
+ liveMeeting.props.meetingProp.intId, msg.header.userId)
val body = PresentationPageGeneratedEvtMsgBody(msg.body.podId, msg.body.messageKey, msg.body.code, msg.body.presentationId, msg.body.numberOfPages, msg.body.pagesCompleted, msg.body.presName)
val event = PresentationPageGeneratedEvtMsg(header, body)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationSender.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationSender.scala
index 3c7d111df6697eab6c79a3ea4f56c245589cbd1c..ef1dc4620c3943afd98d15d728f1f9679828bd11 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationSender.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/PresentationSender.scala
@@ -11,12 +11,10 @@ object PresentationSender {
podId: String, userId: String,
presentationId: String,
downloadable: Boolean,
- presFilename: String
- ): Unit = {
+ presFilename: String): Unit = {
val routing = Routing.addMsgToClientRouting(
MessageTypes.BROADCAST_TO_MEETING,
- meetingId, userId
- )
+ meetingId, userId)
val envelope = BbbCoreEnvelope(SetPresentationDownloadableEvtMsg.NAME, routing)
val header = BbbClientMsgHeader(SetPresentationDownloadableEvtMsg.NAME, meetingId, userId)
@@ -30,12 +28,10 @@ object PresentationSender {
bus: MessageBus,
meetingId: String,
podId: String, userId: String, messageKey: String,
- code: String, presentation: PresentationVO
- ): Unit = {
+ code: String, presentation: PresentationVO): Unit = {
val routing = Routing.addMsgToClientRouting(
MessageTypes.BROADCAST_TO_MEETING,
- meetingId, userId
- )
+ meetingId, userId)
val envelope = BbbCoreEnvelope(PresentationConversionCompletedEvtMsg.NAME, routing)
val header = BbbClientMsgHeader(PresentationConversionCompletedEvtMsg.NAME, meetingId, userId)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/RemovePresentationPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/RemovePresentationPubMsgHdlr.scala
index 2d80d5b70ae87df53bbc5327aa3c44b64176cc2f..3c97f3134b28e19fe554eabdef959adcee81b5f0 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/RemovePresentationPubMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/RemovePresentationPubMsgHdlr.scala
@@ -11,8 +11,7 @@ trait RemovePresentationPubMsgHdlr extends RightsManagementTrait {
def handle(
msg: RemovePresentationPubMsg, state: MeetingState2x,
- liveMeeting: LiveMeeting, bus: MessageBus
- ): MeetingState2x = {
+ liveMeeting: LiveMeeting, bus: MessageBus): MeetingState2x = {
if (filterPresentationMessage(liveMeeting.users2x, msg.header.userId) &&
permissionFailed(PermissionCheck.GUEST_LEVEL, PermissionCheck.PRESENTER_LEVEL, liveMeeting.users2x, msg.header.userId)) {
@@ -24,8 +23,7 @@ trait RemovePresentationPubMsgHdlr extends RightsManagementTrait {
def broadcastRemovePresentationEvtMsg(podId: String, userId: String, presentationId: String): Unit = {
val routing = Routing.addMsgToClientRouting(
MessageTypes.BROADCAST_TO_MEETING,
- liveMeeting.props.meetingProp.intId, userId
- )
+ liveMeeting.props.meetingProp.intId, userId)
val envelope = BbbCoreEnvelope(RemovePresentationEvtMsg.NAME, routing)
val header = BbbClientMsgHeader(RemovePresentationEvtMsg.NAME, liveMeeting.props.meetingProp.intId, userId)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/ResizeAndMovePagePubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/ResizeAndMovePagePubMsgHdlr.scala
index eb77c7a1b86bdc50296acdcb155c2224feabb6b8..747ad135d8d2e1c84632354b175096202bc6da65 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/ResizeAndMovePagePubMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/ResizeAndMovePagePubMsgHdlr.scala
@@ -16,13 +16,11 @@ trait ResizeAndMovePagePubMsgHdlr extends RightsManagementTrait {
def broadcastEvent(msg: ResizeAndMovePagePubMsg, podId: String, page: PageVO): Unit = {
val routing = Routing.addMsgToClientRouting(
MessageTypes.BROADCAST_TO_MEETING,
- liveMeeting.props.meetingProp.intId, msg.header.userId
- )
+ liveMeeting.props.meetingProp.intId, msg.header.userId)
val envelope = BbbCoreEnvelope(ResizeAndMovePageEvtMsg.NAME, routing)
val header = BbbClientMsgHeader(
ResizeAndMovePageEvtMsg.NAME,
- liveMeeting.props.meetingProp.intId, msg.header.userId
- )
+ liveMeeting.props.meetingProp.intId, msg.header.userId)
val body = ResizeAndMovePageEvtMsgBody(podId, msg.body.presentationId, page.id,
page.xOffset, page.yOffset, page.widthRatio, page.heightRatio)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/SetCurrentPagePubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/SetCurrentPagePubMsgHdlr.scala
index 3a3ff517f6c0d988dfc366f328c15dc3277c9a63..09b58e0f0617fcfccdb3d80b1aeea4ed740f070a 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/SetCurrentPagePubMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/SetCurrentPagePubMsgHdlr.scala
@@ -12,8 +12,7 @@ trait SetCurrentPagePubMsgHdlr extends RightsManagementTrait {
def handle(
msg: SetCurrentPagePubMsg, state: MeetingState2x,
- liveMeeting: LiveMeeting, bus: MessageBus
- ): MeetingState2x = {
+ liveMeeting: LiveMeeting, bus: MessageBus): MeetingState2x = {
if (filterPresentationMessage(liveMeeting.users2x, msg.header.userId) &&
permissionFailed(PermissionCheck.GUEST_LEVEL, PermissionCheck.PRESENTER_LEVEL, liveMeeting.users2x, msg.header.userId)) {
@@ -25,8 +24,7 @@ trait SetCurrentPagePubMsgHdlr extends RightsManagementTrait {
def broadcastSetCurrentPageEvtMsg(podId: String, presentationId: String, pageId: String, userId: String): Unit = {
val routing = Routing.addMsgToClientRouting(
MessageTypes.BROADCAST_TO_MEETING,
- liveMeeting.props.meetingProp.intId, userId
- )
+ liveMeeting.props.meetingProp.intId, userId)
val envelope = BbbCoreEnvelope(SetCurrentPageEvtMsg.NAME, routing)
val header = BbbClientMsgHeader(SetCurrentPageEvtMsg.NAME, liveMeeting.props.meetingProp.intId, userId)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/SetCurrentPresentationPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/SetCurrentPresentationPubMsgHdlr.scala
index d25cf9e8b89af8b1df7fd4df25a9ff402425c322..7b72021d66ffa9f684d1c8a70c8bb4dfddcda2b8 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/SetCurrentPresentationPubMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/SetCurrentPresentationPubMsgHdlr.scala
@@ -11,8 +11,7 @@ trait SetCurrentPresentationPubMsgHdlr extends RightsManagementTrait {
def handle(
msg: SetCurrentPresentationPubMsg, state: MeetingState2x,
- liveMeeting: LiveMeeting, bus: MessageBus
- ): MeetingState2x = {
+ liveMeeting: LiveMeeting, bus: MessageBus): MeetingState2x = {
if (filterPresentationMessage(liveMeeting.users2x, msg.header.userId) &&
permissionFailed(PermissionCheck.GUEST_LEVEL, PermissionCheck.PRESENTER_LEVEL, liveMeeting.users2x, msg.header.userId)) {
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/SetPresentationDownloadablePubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/SetPresentationDownloadablePubMsgHdlr.scala
index 2c24143076b8eecc6989563e33370bb83aa02f0b..c4bd9b24c7692a6e715130d9c6da3d30711fb083 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/SetPresentationDownloadablePubMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/SetPresentationDownloadablePubMsgHdlr.scala
@@ -11,8 +11,7 @@ trait SetPresentationDownloadablePubMsgHdlr extends RightsManagementTrait {
def handle(
msg: SetPresentationDownloadablePubMsg, state: MeetingState2x,
- liveMeeting: LiveMeeting, bus: MessageBus
- ): MeetingState2x = {
+ liveMeeting: LiveMeeting, bus: MessageBus): MeetingState2x = {
val meetingId = liveMeeting.props.meetingProp.intId
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/SetPresenterInPodReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/SetPresenterInPodReqMsgHdlr.scala
index 34f13de72b08fdf9e77619557e0837e66b78bd12..3b6fa97a7ce2042ba33f5c80845461705633144e 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/SetPresenterInPodReqMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/presentationpod/SetPresenterInPodReqMsgHdlr.scala
@@ -13,8 +13,7 @@ trait SetPresenterInPodReqMsgHdlr {
def handle(
msg: SetPresenterInPodReqMsg, state: MeetingState2x,
- liveMeeting: LiveMeeting, bus: MessageBus
- ): MeetingState2x = {
+ liveMeeting: LiveMeeting, bus: MessageBus): MeetingState2x = {
if (msg.body.podId == PresentationPod.DEFAULT_PRESENTATION_POD) {
// Swith presenter as default presenter pod has changed.
AssignPresenterActionHandler.handleAction(liveMeeting, bus.outGW, msg.header.userId, msg.body.nextPresenterId)
@@ -30,8 +29,7 @@ object SetPresenterInPodActionHandler extends RightsManagementTrait {
outGW: OutMsgRouter,
assignedBy: String,
podId: String,
- newPresenterId: String
- ): MeetingState2x = {
+ newPresenterId: String): MeetingState2x = {
if (permissionFailed(PermissionCheck.MOD_LEVEL, PermissionCheck.VIEWER_LEVEL, liveMeeting.users2x, assignedBy)) {
val meetingId = liveMeeting.props.meetingProp.intId
@@ -42,8 +40,7 @@ object SetPresenterInPodActionHandler extends RightsManagementTrait {
def broadcastSetPresenterInPodRespMsg(podId: String, nextPresenterId: String, requesterId: String): Unit = {
val routing = Routing.addMsgToClientRouting(
MessageTypes.BROADCAST_TO_MEETING,
- liveMeeting.props.meetingProp.intId, requesterId
- )
+ liveMeeting.props.meetingProp.intId, requesterId)
val envelope = BbbCoreEnvelope(SetPresenterInPodRespMsg.NAME, routing)
val header = BbbClientMsgHeader(SetPresenterInPodRespMsg.NAME, liveMeeting.props.meetingProp.intId, requesterId)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/GetScreenshareStatusReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/GetScreenshareStatusReqMsgHdlr.scala
index fbea8767508712f11c5940b2646540f0d8fd8fcc..459ed4d1d9d2ec5872566aebbed5510b228bda53 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/GetScreenshareStatusReqMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/GetScreenshareStatusReqMsgHdlr.scala
@@ -16,8 +16,7 @@ trait GetScreenshareStatusReqMsgHdlr {
val envelope = BbbCoreEnvelope(ScreenshareRtmpBroadcastStartedEvtMsg.NAME, routing)
val header = BbbClientMsgHeader(
ScreenshareRtmpBroadcastStartedEvtMsg.NAME,
- liveMeeting.props.meetingProp.intId, "not-used"
- )
+ liveMeeting.props.meetingProp.intId, "not-used")
val voiceConf = ScreenshareModel.getVoiceConf(liveMeeting.screenshareModel)
val screenshareConf = ScreenshareModel.getScreenshareConf(liveMeeting.screenshareModel)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareRtmpBroadcastStartedVoiceConfEvtMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareRtmpBroadcastStartedVoiceConfEvtMsgHdlr.scala
index e72788eb6b68e87c3c9cc9ab2158612579df5a48..52b3ed454ce427f05872034fefd83520929d4c88 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareRtmpBroadcastStartedVoiceConfEvtMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareRtmpBroadcastStartedVoiceConfEvtMsgHdlr.scala
@@ -14,13 +14,11 @@ trait ScreenshareRtmpBroadcastStartedVoiceConfEvtMsgHdlr {
val routing = Routing.addMsgToClientRouting(
MessageTypes.BROADCAST_TO_MEETING,
- liveMeeting.props.meetingProp.intId, "not-used"
- )
+ liveMeeting.props.meetingProp.intId, "not-used")
val envelope = BbbCoreEnvelope(ScreenshareRtmpBroadcastStartedEvtMsg.NAME, routing)
val header = BbbClientMsgHeader(
ScreenshareRtmpBroadcastStartedEvtMsg.NAME,
- liveMeeting.props.meetingProp.intId, "not-used"
- )
+ liveMeeting.props.meetingProp.intId, "not-used")
val body = ScreenshareRtmpBroadcastStartedEvtMsgBody(voiceConf, screenshareConf,
stream, vidWidth, vidHeight, timestamp)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareRtmpBroadcastStoppedVoiceConfEvtMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareRtmpBroadcastStoppedVoiceConfEvtMsgHdlr.scala
index bfe9fda5fb935d64f6e0ccc1dc3cee56f0770817..397b784b7c51ee765a899c7f72f20533ec90bc46 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareRtmpBroadcastStoppedVoiceConfEvtMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareRtmpBroadcastStoppedVoiceConfEvtMsgHdlr.scala
@@ -16,13 +16,11 @@ trait ScreenshareRtmpBroadcastStoppedVoiceConfEvtMsgHdlr {
val routing = Routing.addMsgToClientRouting(
MessageTypes.BROADCAST_TO_MEETING,
- liveMeeting.props.meetingProp.intId, "not-used"
- )
+ liveMeeting.props.meetingProp.intId, "not-used")
val envelope = BbbCoreEnvelope(ScreenshareRtmpBroadcastStoppedEvtMsg.NAME, routing)
val header = BbbClientMsgHeader(
ScreenshareRtmpBroadcastStoppedEvtMsg.NAME,
- liveMeeting.props.meetingProp.intId, "not-used"
- )
+ liveMeeting.props.meetingProp.intId, "not-used")
val body = ScreenshareRtmpBroadcastStoppedEvtMsgBody(voiceConf, screenshareConf,
stream, vidWidth, vidHeight, timestamp)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareStartedVoiceConfEvtMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareStartedVoiceConfEvtMsgHdlr.scala
index 8f563e63ecd0da0969d833f71a7be8f9f69894b3..a7b115ee63cce51cf4c87b7950241a4e565d54e8 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareStartedVoiceConfEvtMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareStartedVoiceConfEvtMsgHdlr.scala
@@ -16,8 +16,7 @@ trait ScreenshareStartedVoiceConfEvtMsgHdlr {
val envelope = BbbCoreEnvelope(ScreenshareStartRtmpBroadcastVoiceConfMsg.NAME, routing)
val header = BbbCoreHeaderWithMeetingId(
ScreenshareStartRtmpBroadcastVoiceConfMsg.NAME,
- liveMeeting.props.meetingProp.intId
- )
+ liveMeeting.props.meetingProp.intId)
val body = ScreenshareStartRtmpBroadcastVoiceConfMsgBody(voiceConf: String, screenshareConf: String, url: String, timestamp: String)
val event = ScreenshareStartRtmpBroadcastVoiceConfMsg(header, body)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareStoppedVoiceConfEvtMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareStoppedVoiceConfEvtMsgHdlr.scala
index 4252ce3fa8bdd72ea64a695166c6a33d66d4a69b..9bbe7e86b126ee3b76b3f2d34862a477eee610f4 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareStoppedVoiceConfEvtMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/screenshare/ScreenshareStoppedVoiceConfEvtMsgHdlr.scala
@@ -10,12 +10,10 @@ trait ScreenshareStoppedVoiceConfEvtMsgHdlr {
def handle(
msg: ScreenshareStoppedVoiceConfEvtMsg,
- liveMeeting: LiveMeeting, bus: MessageBus
- ): Unit = {
+ liveMeeting: LiveMeeting, bus: MessageBus): Unit = {
handleScreenshareStoppedVoiceConfEvtMsg(
msg.body.voiceConf,
- msg.body.screenshareConf, liveMeeting, bus
- )
+ msg.body.screenshareConf, liveMeeting, bus)
}
def handleScreenshareStoppedVoiceConfEvtMsg(voiceConf: String, screenshareConf: String,
@@ -26,8 +24,7 @@ trait ScreenshareStoppedVoiceConfEvtMsgHdlr {
val envelope = BbbCoreEnvelope(ScreenshareStopRtmpBroadcastVoiceConfMsg.NAME, routing)
val header = BbbCoreHeaderWithMeetingId(
ScreenshareStopRtmpBroadcastVoiceConfMsg.NAME,
- liveMeeting.props.meetingProp.intId
- )
+ liveMeeting.props.meetingProp.intId)
val body = ScreenshareStopRtmpBroadcastVoiceConfMsgBody(voiceConf, screenshareConf, url, timestamp)
val event = ScreenshareStopRtmpBroadcastVoiceConfMsg(header, body)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/AssignPresenterReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/AssignPresenterReqMsgHdlr.scala
index f08f1bf8ba4a572fc877af90a7f3bec04989741b..4398819818d08c423b2834f9a9d2182e76ef07c7 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/AssignPresenterReqMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/AssignPresenterReqMsgHdlr.scala
@@ -31,8 +31,7 @@ object AssignPresenterActionHandler extends RightsManagementTrait {
// unassign old presenter
val routingUnassign = Routing.addMsgToClientRouting(
MessageTypes.BROADCAST_TO_MEETING,
- liveMeeting.props.meetingProp.intId, oldPres.intId
- )
+ liveMeeting.props.meetingProp.intId, oldPres.intId)
val envelopeUnassign = BbbCoreEnvelope(PresenterUnassignedEvtMsg.NAME, routingUnassign)
val headerUnassign = BbbClientMsgHeader(PresenterUnassignedEvtMsg.NAME, liveMeeting.props.meetingProp.intId,
oldPres.intId)
@@ -47,8 +46,7 @@ object AssignPresenterActionHandler extends RightsManagementTrait {
// set new presenter
val routingAssign = Routing.addMsgToClientRouting(
MessageTypes.BROADCAST_TO_MEETING,
- liveMeeting.props.meetingProp.intId, newPres.intId
- )
+ liveMeeting.props.meetingProp.intId, newPres.intId)
val envelopeAssign = BbbCoreEnvelope(PresenterAssignedEvtMsg.NAME, routingAssign)
val headerAssign = BbbClientMsgHeader(PresenterAssignedEvtMsg.NAME, liveMeeting.props.meetingProp.intId,
newPres.intId)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ChangeLockSettingsInMeetingCmdMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ChangeLockSettingsInMeetingCmdMsgHdlr.scala
index f9cb93fb578726fc2ba0a68764185f01553fa250..98c73f5eaf665fcd6211b941e26b5345f7437f86 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ChangeLockSettingsInMeetingCmdMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ChangeLockSettingsInMeetingCmdMsgHdlr.scala
@@ -26,8 +26,7 @@ trait ChangeLockSettingsInMeetingCmdMsgHdlr extends RightsManagementTrait {
disablePubChat = msg.body.disablePubChat,
lockedLayout = msg.body.lockedLayout,
lockOnJoin = msg.body.lockOnJoin,
- lockOnJoinConfigurable = msg.body.lockOnJoinConfigurable
- )
+ lockOnJoinConfigurable = msg.body.lockOnJoinConfigurable)
if (!MeetingStatus2x.permissionsEqual(liveMeeting.status, settings) || !MeetingStatus2x.permisionsInitialized(liveMeeting.status)) {
MeetingStatus2x.initializePermissions(liveMeeting.status)
@@ -37,12 +36,10 @@ trait ChangeLockSettingsInMeetingCmdMsgHdlr extends RightsManagementTrait {
val routing = Routing.addMsgToClientRouting(
MessageTypes.BROADCAST_TO_MEETING,
props.meetingProp.intId,
- msg.body.setBy
- )
+ msg.body.setBy)
val envelope = BbbCoreEnvelope(
LockSettingsInMeetingChangedEvtMsg.NAME,
- routing
- )
+ routing)
val body = LockSettingsInMeetingChangedEvtMsgBody(
disableCam = settings.disableCam,
disableMic = settings.disableMic,
@@ -51,13 +48,11 @@ trait ChangeLockSettingsInMeetingCmdMsgHdlr extends RightsManagementTrait {
lockedLayout = settings.lockedLayout,
lockOnJoin = settings.lockOnJoin,
lockOnJoinConfigurable = settings.lockOnJoinConfigurable,
- msg.body.setBy
- )
+ msg.body.setBy)
val header = BbbClientMsgHeader(
LockSettingsInMeetingChangedEvtMsg.NAME,
props.meetingProp.intId,
- msg.body.setBy
- )
+ msg.body.setBy)
outGW.send(BbbCommonEnvCoreMsg(envelope, LockSettingsInMeetingChangedEvtMsg(header, body)))
}
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/EjectUserFromMeetingCmdMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/EjectUserFromMeetingCmdMsgHdlr.scala
index 29014f5c5bf21d84a05620a11736c28ae94a9fb5..b06ac89eafc1514f2c192ad4bbef007596536d81 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/EjectUserFromMeetingCmdMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/EjectUserFromMeetingCmdMsgHdlr.scala
@@ -21,8 +21,7 @@ trait EjectUserFromMeetingCmdMsgHdlr extends RightsManagementTrait {
PermissionCheck.MOD_LEVEL,
PermissionCheck.VIEWER_LEVEL,
liveMeeting.users2x,
- msg.header.userId
- )) {
+ msg.header.userId)) {
val reason = "No permission to eject user from meeting."
PermissionCheck.ejectUserForFailedPermission(meetingId, msg.header.userId, reason, outGW, liveMeeting)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/GetLockSettingsReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/GetLockSettingsReqMsgHdlr.scala
index ef64a7e8a906060fc9bea124213bc3a450e05722..e26e56b626bd66dfafde79ebcfe4434e069a1a99 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/GetLockSettingsReqMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/GetLockSettingsReqMsgHdlr.scala
@@ -19,8 +19,7 @@ trait GetLockSettingsReqMsgHdlr {
disableCam = settings.disableCam,
disableMic = settings.disableMic, disablePrivChat = settings.disablePrivChat,
disablePubChat = settings.disablePubChat, lockedLayout = settings.lockedLayout,
- lockOnJoin = settings.lockOnJoin, lockOnJoinConfigurable = settings.lockOnJoinConfigurable
- )
+ lockOnJoin = settings.lockOnJoin, lockOnJoinConfigurable = settings.lockOnJoinConfigurable)
val header = BbbClientMsgHeader(GetLockSettingsRespMsg.NAME, meetingId, requestedBy)
val event = GetLockSettingsRespMsg(header, body)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/MeetingActivityResponseCmdMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/MeetingActivityResponseCmdMsgHdlr.scala
index 538a7d3f581781e7a1e03db61c4f328b2f4b4fa0..35da4f368dee09f9ea7ecb42f0aba3196b7cce12 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/MeetingActivityResponseCmdMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/MeetingActivityResponseCmdMsgHdlr.scala
@@ -13,8 +13,7 @@ trait MeetingActivityResponseCmdMsgHdlr {
def handleMeetingActivityResponseCmdMsg(
msg: MeetingActivityResponseCmdMsg,
- state: MeetingState2x
- ): MeetingState2x = {
+ state: MeetingState2x): MeetingState2x = {
processMeetingActivityResponse(liveMeeting.props, outGW, msg)
val tracker = state.inactivityTracker.resetWarningSentAndTimestamp()
state.update(tracker)
@@ -23,8 +22,7 @@ trait MeetingActivityResponseCmdMsgHdlr {
def processMeetingActivityResponse(
props: DefaultProps,
outGW: OutMsgRouter,
- msg: MeetingActivityResponseCmdMsg
- ): Unit = {
+ msg: MeetingActivityResponseCmdMsg): Unit = {
def buildMeetingIsActiveEvtMsg(meetingId: String): BbbCommonEnvCoreMsg = {
val routing = Routing.addMsgToClientRouting(MessageTypes.BROADCAST_TO_MEETING, meetingId, "not-used")
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/MuteUserCmdMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/MuteUserCmdMsgHdlr.scala
index f68c33e2ff221e78c5d630639a0e2bd4db4093c7..9f1412920a075f2045f87782f97c82d5a7a5763a 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/MuteUserCmdMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/MuteUserCmdMsgHdlr.scala
@@ -16,8 +16,7 @@ trait MuteUserCmdMsgHdlr extends RightsManagementTrait {
def handleMuteUserCmdMsg(msg: MuteUserCmdMsg) {
if (msg.body.userId != msg.header.userId && (msg.body.mute == false || permissionFailed(
PermissionCheck.MOD_LEVEL,
- PermissionCheck.VIEWER_LEVEL, liveMeeting.users2x, msg.header.userId
- ))) {
+ PermissionCheck.VIEWER_LEVEL, liveMeeting.users2x, msg.header.userId))) {
val meetingId = liveMeeting.props.meetingProp.intId
val muteUnmuteStr: String = if (msg.body.mute) "mute" else "unmute"
val reason = "No permission to " + muteUnmuteStr + " user."
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/SyncGetUsersMeetingRespMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/SyncGetUsersMeetingRespMsgHdlr.scala
index a7887a0b746038cad56fa9e84642ae79bbd175a4..e0b7eb5693bc92832475086ee9cc9b196de58fbb 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/SyncGetUsersMeetingRespMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/SyncGetUsersMeetingRespMsgHdlr.scala
@@ -31,8 +31,7 @@ trait SyncGetUsersMeetingRespMsgHdlr {
locked = u.locked,
presenter = u.presenter,
avatar = u.avatar,
- clientType = u.clientType
- )
+ clientType = u.clientType)
}
val body = SyncGetUsersMeetingRespMsgBody(webUsers)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala
index 657bf9449c2614272e3b467f7f54d0286b8b27fd..f50c70f0ed3b3da78bf019049e7fd556cf5e4d30 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala
@@ -20,8 +20,7 @@ trait UserLeaveReqMsgHdlr {
def broadcastSetPresenterInPodRespMsg(podId: String, nextPresenterId: String, requesterId: String): Unit = {
val routing = Routing.addMsgToClientRouting(
MessageTypes.BROADCAST_TO_MEETING,
- liveMeeting.props.meetingProp.intId, requesterId
- )
+ liveMeeting.props.meetingProp.intId, requesterId)
val envelope = BbbCoreEnvelope(SetPresenterInPodRespMsg.NAME, routing)
val header = BbbClientMsgHeader(SetPresenterInPodRespMsg.NAME, liveMeeting.props.meetingProp.intId, requesterId)
@@ -56,8 +55,7 @@ trait UserLeaveReqMsgHdlr {
screenshareApp2x.handleScreenshareStoppedVoiceConfEvtMsg(
liveMeeting.props.voiceProp.voiceConf,
liveMeeting.props.screenshareProps.screenshareConf,
- liveMeeting, msgBus
- )
+ liveMeeting, msgBus)
// request ongoing poll to end
pollApp.stopPoll(state, u.intId, liveMeeting, msgBus)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
index 3e24fd443c1990eecbe3d944c13a225f92e4862e..515c618909da0b9edaace3c7aba4301a25b47501 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
@@ -32,8 +32,7 @@ object UsersApp {
val event = MsgBuilder.buildGuestApprovedEvtMsg(
liveMeeting.props.meetingProp.intId,
- guest.guest, guest.status, approvedBy
- )
+ guest.guest, guest.status, approvedBy)
outGW.send(event)
@@ -61,8 +60,7 @@ object UsersApp {
// send a message to client
Sender.sendUserEjectedFromMeetingClientEvtMsg(
meetingId,
- userId, ejectedBy, reason, reasonCode, outGW
- )
+ userId, ejectedBy, reason, reasonCode, outGW)
}
def sendUserLeftMeetingToAllClients(outGW: OutMsgRouter, meetingId: String,
@@ -76,13 +74,11 @@ object UsersApp {
outGW: OutMsgRouter,
meetingId: String,
voiceConf: String,
- voiceUserId: String
- ): Unit = {
+ voiceUserId: String): Unit = {
val ejectFromVoiceEvent = MsgBuilder.buildEjectUserFromVoiceConfSysMsg(
meetingId,
voiceConf,
- voiceUserId
- )
+ voiceUserId)
outGW.send(ejectFromVoiceEvent)
}
@@ -108,8 +104,7 @@ object UsersApp {
sendEjectUserFromVoiceToFreeswitch(
outGW,
liveMeeting.props.meetingProp.intId,
- liveMeeting.props.voiceProp.voiceConf, vu.voiceUserId
- )
+ liveMeeting.props.voiceProp.voiceConf, vu.voiceUserId)
}
}
@@ -118,8 +113,7 @@ object UsersApp {
class UsersApp(
val liveMeeting: LiveMeeting,
val outGW: OutMsgRouter,
- val eventBus: InternalEventBus
-)(implicit val context: ActorContext)
+ val eventBus: InternalEventBus)(implicit val context: ActorContext)
extends ValidateAuthTokenReqMsgHdlr
with GetUsersMeetingReqMsgHdlr
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserJoinedVoiceConfEvtMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserJoinedVoiceConfEvtMsgHdlr.scala
index fae8e4fec0d202cca75dad55a2397acae701336a..acaa6e82130be689f0febe1bf1dacac1e8a6a73d 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserJoinedVoiceConfEvtMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserJoinedVoiceConfEvtMsgHdlr.scala
@@ -26,13 +26,11 @@ trait UserJoinedVoiceConfEvtMsgHdlr extends BreakoutHdlrHelpers with SystemConfi
def broadcastEvent(voiceUserState: VoiceUserState): Unit = {
val routing = Routing.addMsgToClientRouting(
MessageTypes.BROADCAST_TO_MEETING,
- liveMeeting.props.meetingProp.intId, voiceUserState.intId
- )
+ liveMeeting.props.meetingProp.intId, voiceUserState.intId)
val envelope = BbbCoreEnvelope(UserJoinedVoiceConfToClientEvtMsg.NAME, routing)
val header = BbbClientMsgHeader(
UserJoinedVoiceConfToClientEvtMsg.NAME,
- liveMeeting.props.meetingProp.intId, voiceUserState.intId
- )
+ liveMeeting.props.meetingProp.intId, voiceUserState.intId)
val body = UserJoinedVoiceConfToClientEvtMsgBody(voiceConf, voiceUserState.intId, voiceUserState.voiceUserId,
voiceUserState.callerName, voiceUserState.callerNum, voiceUserState.muted, voiceUserState.talking,
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserMutedInVoiceConfEvtMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserMutedInVoiceConfEvtMsgHdlr.scala
index 107e326459b8244f43dd4789bd5dfc19f41bd700..94b2730200ad82f9dd334bce92b08723c651a47e 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserMutedInVoiceConfEvtMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserMutedInVoiceConfEvtMsgHdlr.scala
@@ -16,13 +16,11 @@ trait UserMutedInVoiceConfEvtMsgHdlr {
val routing = Routing.addMsgToClientRouting(
MessageTypes.BROADCAST_TO_MEETING,
liveMeeting.props.meetingProp.intId,
- vu.intId
- )
+ vu.intId)
val envelope = BbbCoreEnvelope(UserMutedVoiceEvtMsg.NAME, routing)
val header = BbbClientMsgHeader(
UserMutedVoiceEvtMsg.NAME,
- liveMeeting.props.meetingProp.intId, vu.intId
- )
+ liveMeeting.props.meetingProp.intId, vu.intId)
val body = UserMutedVoiceEvtMsgBody(voiceConf = msg.header.voiceConf, intId = vu.intId, voiceUserId = vu.intId, vu.muted)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserTalkingInVoiceConfEvtMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserTalkingInVoiceConfEvtMsgHdlr.scala
index f40499382ad447f605dc5587916b819a74f0b529..0b01e1f84cac24b902ea4f8b2d4cdf451b97b0c1 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserTalkingInVoiceConfEvtMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserTalkingInVoiceConfEvtMsgHdlr.scala
@@ -16,13 +16,11 @@ trait UserTalkingInVoiceConfEvtMsgHdlr {
val routing = Routing.addMsgToClientRouting(
MessageTypes.BROADCAST_TO_MEETING,
liveMeeting.props.meetingProp.intId,
- vu.intId
- )
+ vu.intId)
val envelope = BbbCoreEnvelope(UserTalkingVoiceEvtMsg.NAME, routing)
val header = BbbClientMsgHeader(
UserTalkingVoiceEvtMsg.NAME,
- liveMeeting.props.meetingProp.intId, vu.intId
- )
+ liveMeeting.props.meetingProp.intId, vu.intId)
val body = UserTalkingVoiceEvtMsgBody(voiceConf = msg.header.voiceConf, intId = vu.intId, voiceUserId = vu.intId, vu.talking)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala
index b26bc6765b57e6a50f09153f016468ab58d37a8b..7131602ad6189d577b00050ea695e2839c572a21 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala
@@ -19,8 +19,7 @@ object VoiceApp {
val event = MsgBuilder.buildStartRecordingVoiceConfSysMsg(
liveMeeting.props.meetingProp.intId,
liveMeeting.props.voiceProp.voiceConf,
- stream
- )
+ stream)
outGW.send(event)
}
@@ -31,8 +30,7 @@ object VoiceApp {
recStreams foreach { rs =>
val event = MsgBuilder.buildStopRecordingVoiceConfSysMsg(
liveMeeting.props.meetingProp.intId,
- liveMeeting.props.voiceProp.voiceConf, rs.stream
- )
+ liveMeeting.props.voiceProp.voiceConf, rs.stream)
outGW.send(event)
}
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/SendWhiteboardAnnotationPubMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/SendWhiteboardAnnotationPubMsgHdlr.scala
index 224e4ba618bae8133d8f87bf69df6cff9bf75b9d..5fe7fe2b6feb13520736453444c4f2ef4a69da7e 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/SendWhiteboardAnnotationPubMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/SendWhiteboardAnnotationPubMsgHdlr.scala
@@ -29,8 +29,7 @@ trait SendWhiteboardAnnotationPubMsgHdlr extends RightsManagementTrait {
if (!excludedWbMsg(msg.body.annotation) && filterWhiteboardMessage(msg.body.annotation.wbId, liveMeeting) && permissionFailed(
PermissionCheck.GUEST_LEVEL,
- PermissionCheck.PRESENTER_LEVEL, liveMeeting.users2x, msg.header.userId
- )) {
+ PermissionCheck.PRESENTER_LEVEL, liveMeeting.users2x, msg.header.userId)) {
//val meetingId = liveMeeting.props.meetingProp.intId
//val reason = "No permission to send a whiteboard annotation."
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/BreakoutRoom2x.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/BreakoutRoom2x.scala
index 00c1eea66d63f94992b076d6a2b75d829f45ea22..b94523baea02b5dcf836467a67cbb41ce67ce013 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/BreakoutRoom2x.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/BreakoutRoom2x.scala
@@ -1,19 +1,18 @@
package org.bigbluebutton.core.domain
case class BreakoutRoom2x(
- id: String,
- externalId: String,
- name: String,
- parentId: String,
- sequence: Int,
- freeJoin: Boolean,
- voiceConf: String,
- assignedUsers: Vector[String],
- users: Vector[BreakoutUser],
- voiceUsers: Vector[BreakoutVoiceUser],
- startedOn: Option[Long],
- started: Boolean
-) {
+ id: String,
+ externalId: String,
+ name: String,
+ parentId: String,
+ sequence: Int,
+ freeJoin: Boolean,
+ voiceConf: String,
+ assignedUsers: Vector[String],
+ users: Vector[BreakoutUser],
+ voiceUsers: Vector[BreakoutVoiceUser],
+ startedOn: Option[Long],
+ started: Boolean) {
}
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingInactivityTracker.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingInactivityTracker.scala
index f2ad496368a20c8b1422d34e13d6ec818f2297e2..96fa0e49bdc80d6cf25e2ac6db6bfe4adcf6882a 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingInactivityTracker.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingInactivityTracker.scala
@@ -1,12 +1,11 @@
package org.bigbluebutton.core.domain
case class MeetingInactivityTracker(
- val maxInactivityTimeoutInMs: Long,
- val warningBeforeMaxInMs: Long,
- lastActivityTimestampInMs: Long,
- warningSent: Boolean,
- warningSentOnTimestampInMs: Long
-) {
+ val maxInactivityTimeoutInMs: Long,
+ val warningBeforeMaxInMs: Long,
+ lastActivityTimestampInMs: Long,
+ warningSent: Boolean,
+ warningSentOnTimestampInMs: Long) {
def setWarningSentAndTimestamp(nowInMs: Long): MeetingInactivityTracker = {
copy(warningSent = true, warningSentOnTimestampInMs = nowInMs)
}
@@ -35,17 +34,16 @@ case class MeetingInactivityTracker(
}
case class MeetingExpiryTracker(
- startedOnInMs: Long,
- userHasJoined: Boolean,
- isBreakout: Boolean,
- lastUserLeftOnInMs: Option[Long],
- durationInMs: Long,
- meetingExpireIfNoUserJoinedInMs: Long,
- meetingExpireWhenLastUserLeftInMs: Long,
- userInactivityInspectTimerInMs: Long,
- userInactivityThresholdInMs: Long,
- userActivitySignResponseDelayInMs: Long
-) {
+ startedOnInMs: Long,
+ userHasJoined: Boolean,
+ isBreakout: Boolean,
+ lastUserLeftOnInMs: Option[Long],
+ durationInMs: Long,
+ meetingExpireIfNoUserJoinedInMs: Long,
+ meetingExpireWhenLastUserLeftInMs: Long,
+ userInactivityInspectTimerInMs: Long,
+ userInactivityThresholdInMs: Long,
+ userActivitySignResponseDelayInMs: Long) {
def setUserHasJoined(): MeetingExpiryTracker = {
if (!userHasJoined) {
copy(userHasJoined = true, lastUserLeftOnInMs = None)
@@ -98,10 +96,9 @@ case class MeetingExpiryTracker(
}
case class MeetingRecordingTracker(
- startedOnInMs: Long,
- previousDurationInMs: Long,
- currentDurationInMs: Long
-) {
+ startedOnInMs: Long,
+ previousDurationInMs: Long,
+ currentDurationInMs: Long) {
def startTimer(nowInMs: Long): MeetingRecordingTracker = {
copy(startedOnInMs = nowInMs)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingState2x.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingState2x.scala
index 5b405145f780ad298929aade560ed5d2ff9a7741..53abb45e1eb1f40db19e9bcfc0099c48db252269 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingState2x.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingState2x.scala
@@ -9,13 +9,12 @@ object MeetingState2x {
}
case class MeetingState2x(
- groupChats: GroupChats,
- presentationPodManager: PresentationPodManager,
- breakout: Option[BreakoutModel],
- inactivityTracker: MeetingInactivityTracker,
- expiryTracker: MeetingExpiryTracker,
- recordingTracker: MeetingRecordingTracker
-) {
+ groupChats: GroupChats,
+ presentationPodManager: PresentationPodManager,
+ breakout: Option[BreakoutModel],
+ inactivityTracker: MeetingInactivityTracker,
+ expiryTracker: MeetingExpiryTracker,
+ recordingTracker: MeetingRecordingTracker) {
def update(groupChats: GroupChats): MeetingState2x = copy(groupChats = groupChats)
def update(presPodManager: PresentationPodManager): MeetingState2x = copy(presentationPodManager = presPodManager)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala
index ce71e4173e0f5a090004830f52f543fb029fdcf5..9cca751baf0962378ff82085cf6067122443852d 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala
@@ -227,8 +227,7 @@ case class UserState(
avatar: String,
roleChangedOn: Long = System.currentTimeMillis(),
lastActivityTime: Long = TimeUtil.timeNowInMs(),
- clientType: String
-)
+ clientType: String)
case class UserIdAndName(id: String, name: String)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Values.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Values.scala
index 7668b03f98993f6fb6f274f38b2551e340af1e56..45c751843c445fd966f955bc9684643c95849926 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Values.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Values.scala
@@ -10,8 +10,7 @@ case class Voice(
callerId: CallerId = CallerId(),
muted: Boolean = false,
talking: Boolean = false,
- locked: Boolean = false
-)
+ locked: Boolean = false)
case class UserV(
id: String,
@@ -19,5 +18,4 @@ case class UserV(
name: String,
role: String = Roles.VIEWER_ROLE,
status: Status = Status(),
- voice: Voice = Voice()
-)
\ No newline at end of file
+ voice: Voice = Voice())
\ No newline at end of file
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
index d2970f9331b5f7ec695d7f35a06c006d19d1742b..7d762dbb11a7ba9e0a4d168621abb52967782224 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
@@ -15,8 +15,7 @@ object ReceivedJsonMsgHandlerActor {
class ReceivedJsonMsgHandlerActor(
val eventBus: BbbMsgRouterEventBus,
- val incomingJsonMessageBus: IncomingJsonMessageBus
-)
+ val incomingJsonMessageBus: IncomingJsonMessageBus)
extends Actor with ActorLogging
with SystemConfiguration
with ReceivedJsonMsgDeserializer
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/AuditHelpers.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/AuditHelpers.scala
index 5a4e825082b91d175612b7128ec5cce05169b83a..b378a419ce596dc9cc09e047275956770e639ba6 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/AuditHelpers.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/AuditHelpers.scala
@@ -8,8 +8,7 @@ trait AuditHelpers {
def getUsersInVoiceConf(
props: DefaultProps,
- outGW: OutMsgRouter
- ): Unit = {
+ outGW: OutMsgRouter): Unit = {
def buildGetUsersInVoiceConfSysMsg(meetingId: String): BbbCommonEnvCoreMsg = {
val routing = collection.immutable.HashMap("sender" -> "bbb-apps-akka")
val envelope = BbbCoreEnvelope(GetUsersInVoiceConfSysMsg.NAME, routing)
@@ -26,8 +25,7 @@ trait AuditHelpers {
def sendBreakoutRoomCreatedToParent(
props: DefaultProps,
- eventBus: InternalEventBus
- ): Unit = {
+ eventBus: InternalEventBus): Unit = {
// eventBus.publish(BigBlueButtonEvent(
// props.breakoutProps.parentId,
// BreakoutRoomCreated(props.breakoutProps.parentId, props.meetingProp.intId)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala
index 3f86c19878bd730f23f761e96575699189b2d2b2..404b3c274dc0095228a2f2044fc45255e40ee2cb 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala
@@ -43,8 +43,7 @@ trait HandlerHelpers extends SystemConfiguration {
presenter = false,
locked = MeetingStatus2x.getPermissions(liveMeeting.status).lockOnJoin,
avatar = regUser.avatarURL,
- clientType = clientType
- )
+ clientType = clientType)
}
nu match {
@@ -95,8 +94,7 @@ trait HandlerHelpers extends SystemConfiguration {
val event = buildRecordingStatusChangedEvtMsg(
liveMeeting.props.meetingProp.intId,
- "system", MeetingStatus2x.isRecording(liveMeeting.status)
- )
+ "system", MeetingStatus2x.isRecording(liveMeeting.status))
outGW.send(event)
newState = state.update(tracker)
}
@@ -124,8 +122,7 @@ trait HandlerHelpers extends SystemConfiguration {
val event = buildRecordingStatusChangedEvtMsg(
liveMeeting.props.meetingProp.intId,
- "system", MeetingStatus2x.isRecording(liveMeeting.status)
- )
+ "system", MeetingStatus2x.isRecording(liveMeeting.status))
outGW.send(event)
newState = state.update(tracker)
}
@@ -172,8 +169,7 @@ trait HandlerHelpers extends SystemConfiguration {
if (liveMeeting.props.meetingProp.isBreakout) {
eventBus.publish(BigBlueButtonEvent(
liveMeeting.props.breakoutProps.parentId,
- new BreakoutRoomEndedInternalMsg(liveMeeting.props.meetingProp.intId)
- ))
+ new BreakoutRoomEndedInternalMsg(liveMeeting.props.meetingProp.intId)))
}
}
@@ -213,8 +209,7 @@ trait HandlerHelpers extends SystemConfiguration {
if (liveMeeting.props.meetingProp.isBreakout) {
eventBus.publish(BigBlueButtonEvent(
liveMeeting.props.breakoutProps.parentId,
- new BreakoutRoomEndedInternalMsg(meetingId)
- ))
+ new BreakoutRoomEndedInternalMsg(meetingId)))
}
val event = MsgBuilder.buildEjectAllFromVoiceConfMsg(meetingId, liveMeeting.props.voiceProp.voiceConf)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/LiveMeeting.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/LiveMeeting.scala
index 366a08d97321633461b794aaee17174e4ce1c56c..338a1deae3fd1d526b40e1e8636688bfb1c8ab60 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/LiveMeeting.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/LiveMeeting.scala
@@ -20,5 +20,4 @@ class LiveMeeting(
val webcams: Webcams,
val voiceUsers: VoiceUsers,
val users2x: Users2x,
- val guestsWaiting: GuestsWaiting
-)
+ val guestsWaiting: GuestsWaiting)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
index ad5dced59d563eaf6e3b92f0b936c73166803b36..a8a66b6b6b7112dc42e86f8b13d66434c5e50e7c 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
@@ -51,34 +51,34 @@ class MeetingActor(
val eventBus: InternalEventBus,
val outGW: OutMsgRouter,
val liveMeeting: LiveMeeting)
- extends BaseMeetingActor
- with SystemConfiguration
- with GuestsApp
- with LayoutApp2x
- with VoiceApp2x
- with BreakoutApp2x
- with UsersApp2x
-
- with UserBroadcastCamStartMsgHdlr
- with UserJoinMeetingReqMsgHdlr
- with UserJoinMeetingAfterReconnectReqMsgHdlr
- with UserBroadcastCamStopMsgHdlr
- with UserConnectedToGlobalAudioMsgHdlr
- with UserDisconnectedFromGlobalAudioMsgHdlr
- with MuteAllExceptPresentersCmdMsgHdlr
- with MuteMeetingCmdMsgHdlr
- with IsMeetingMutedReqMsgHdlr
-
- with EjectUserFromVoiceCmdMsgHdlr
- with EndMeetingSysCmdMsgHdlr
- with DestroyMeetingSysCmdMsgHdlr
- with SendTimeRemainingUpdateHdlr
- with SendBreakoutTimeRemainingMsgHdlr
- with ChangeLockSettingsInMeetingCmdMsgHdlr
- with SyncGetMeetingInfoRespMsgHdlr
- with ClientToServerLatencyTracerMsgHdlr
- with ValidateConnAuthTokenSysMsgHdlr
- with UserActivitySignCmdMsgHdlr {
+ extends BaseMeetingActor
+ with SystemConfiguration
+ with GuestsApp
+ with LayoutApp2x
+ with VoiceApp2x
+ with BreakoutApp2x
+ with UsersApp2x
+
+ with UserBroadcastCamStartMsgHdlr
+ with UserJoinMeetingReqMsgHdlr
+ with UserJoinMeetingAfterReconnectReqMsgHdlr
+ with UserBroadcastCamStopMsgHdlr
+ with UserConnectedToGlobalAudioMsgHdlr
+ with UserDisconnectedFromGlobalAudioMsgHdlr
+ with MuteAllExceptPresentersCmdMsgHdlr
+ with MuteMeetingCmdMsgHdlr
+ with IsMeetingMutedReqMsgHdlr
+
+ with EjectUserFromVoiceCmdMsgHdlr
+ with EndMeetingSysCmdMsgHdlr
+ with DestroyMeetingSysCmdMsgHdlr
+ with SendTimeRemainingUpdateHdlr
+ with SendBreakoutTimeRemainingMsgHdlr
+ with ChangeLockSettingsInMeetingCmdMsgHdlr
+ with SyncGetMeetingInfoRespMsgHdlr
+ with ClientToServerLatencyTracerMsgHdlr
+ with ValidateConnAuthTokenSysMsgHdlr
+ with UserActivitySignCmdMsgHdlr {
override val supervisorStrategy = OneForOneStrategy(maxNrOfRetries = 10, withinTimeRange = 1 minute) {
case e: Exception => {
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActorAudit.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActorAudit.scala
index 80cd85d00b955295fadf5e847f285b80b9da618a..93e4f4bf663cb8aecadf67ab728dba7ca7cbee33 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActorAudit.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActorAudit.scala
@@ -20,8 +20,7 @@ object MeetingActorAudit {
def props(
props: DefaultProps,
eventBus: InternalEventBus,
- outGW: OutMsgRouter
- ): Props =
+ outGW: OutMsgRouter): Props =
Props(classOf[MeetingActorAudit], props, eventBus, outGW)
}
@@ -29,8 +28,7 @@ object MeetingActorAudit {
// periodically sends messages to the meeting actor
class MeetingActorAudit(
val props: DefaultProps,
- val eventBus: InternalEventBus, val outGW: OutMsgRouter
-)
+ val eventBus: InternalEventBus, val outGW: OutMsgRouter)
extends Actor with ActorLogging with SystemConfiguration with AuditHelpers {
object AuditMonitorInternalMsg
@@ -56,8 +54,7 @@ class MeetingActorAudit(
// This is a breakout room. Inform our parent meeting that we have been successfully created.
eventBus.publish(BigBlueButtonEvent(
props.breakoutProps.parentId,
- BreakoutRoomCreatedInternalMsg(props.breakoutProps.parentId, props.meetingProp.intId)
- ))
+ BreakoutRoomCreatedInternalMsg(props.breakoutProps.parentId, props.meetingProp.intId)))
}
@@ -78,8 +75,7 @@ class MeetingActorAudit(
// This is a breakout room. Update the main meeting with list of users in this breakout room.
eventBus.publish(BigBlueButtonEvent(
props.meetingProp.intId,
- SendBreakoutUsersAuditInternalMsg(props.breakoutProps.parentId, props.meetingProp.intId)
- ))
+ SendBreakoutUsersAuditInternalMsg(props.breakoutProps.parentId, props.meetingProp.intId)))
// Trigger recording timer, only for meeting allowing recording
if (props.recordProp.record) {
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingExpiryTrackerHelper.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingExpiryTrackerHelper.scala
index f2e2c292b750989f8511ec0333700c759a9567ba..c343f1a92353804d45fc1f62c0bb6abf4d0f0933 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingExpiryTrackerHelper.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingExpiryTrackerHelper.scala
@@ -11,8 +11,7 @@ trait MeetingExpiryTrackerHelper extends HandlerHelpers {
outGW: OutMsgRouter,
eventBus: InternalEventBus,
liveMeeting: LiveMeeting,
- state: MeetingState2x
- ): (MeetingState2x, Option[String]) = {
+ state: MeetingState2x): (MeetingState2x, Option[String]) = {
val nowInMs = TimeUtil.timeNowInMs()
val (expired, reason) = state.expiryTracker.hasMeetingExpired(nowInMs)
@@ -32,8 +31,7 @@ trait MeetingExpiryTrackerHelper extends HandlerHelpers {
outGW: OutMsgRouter,
eventBus: InternalEventBus,
liveMeeting: LiveMeeting,
- state: MeetingState2x
- ): (MeetingState2x, Option[String]) = {
+ state: MeetingState2x): (MeetingState2x, Option[String]) = {
val nowInMs = TimeUtil.timeNowInMs()
if (!state.inactivityTracker.hasRecentActivity(nowInMs)) {
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala
index ae4349f2e4e0bb4d0c3143d32a40753ef565cc4d..5fa69cd5817b807bcfe4aed9da8d0c6c3471faab 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala
@@ -42,8 +42,7 @@ class RunningMeeting(val props: DefaultProps, outGW: OutMessageGateway,
GuestsWaiting.setGuestPolicy(
liveMeeting.guestsWaiting,
- GuestPolicy(props.usersProp.guestPolicy, SystemUser.ID)
- )
+ GuestPolicy(props.usersProp.guestPolicy, SystemUser.ID))
val outMsgRouter = new OutMsgRouter(props.recordProp.record, outGW)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/MeetingStatus2x.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/MeetingStatus2x.scala
index b9facc77943b277d1e5ceec18d5dced8469129f2..4d8246eaf58c9f38d14f40bc56126c4702911368 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/MeetingStatus2x.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/MeetingStatus2x.scala
@@ -11,8 +11,7 @@ case class Permissions(
disablePubChat: Boolean = false,
lockedLayout: Boolean = false,
lockOnJoin: Boolean = true,
- lockOnJoinConfigurable: Boolean = false
-)
+ lockOnJoinConfigurable: Boolean = false)
case class MeetingExtensionProp(maxExtensions: Int = 2, numExtensions: Int = 0, extendByMinutes: Int = 20,
sendNotice: Boolean = true, sent15MinNotice: Boolean = false,
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/guests/GetGuestsWaitingApprovalReqMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/guests/GetGuestsWaitingApprovalReqMsgHdlr.scala
index 0460f3b1173aa1d3f8d9c93df7b2563c952936c6..1c336e1468dc751869384cd1d41b7a9621273369 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/guests/GetGuestsWaitingApprovalReqMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/guests/GetGuestsWaitingApprovalReqMsgHdlr.scala
@@ -16,8 +16,7 @@ trait GetGuestsWaitingApprovalReqMsgHdlr extends HandlerHelpers {
val event = MsgBuilder.buildGetGuestsWaitingApprovalRespMsg(
liveMeeting.props.meetingProp.intId,
msg.body.requesterId,
- guests
- )
+ guests)
outGW.send(event)
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/guests/GuestsWaitingApprovedMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/guests/GuestsWaitingApprovedMsgHdlr.scala
index fc38882de0c04bc1fdbc37073b4c4b3bc39a1493..289c8f5a63b52a85026c137e443b09e5daeab59e 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/guests/GuestsWaitingApprovedMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/guests/GuestsWaitingApprovedMsgHdlr.scala
@@ -37,8 +37,7 @@ trait GuestsWaitingApprovedMsgHdlr extends HandlerHelpers with RightsManagementT
mods foreach { m =>
val event = MsgBuilder.buildGuestsWaitingApprovedEvtMsg(
liveMeeting.props.meetingProp.intId,
- m.intId, guests, approvedBy
- )
+ m.intId, guests, approvedBy)
outGW.send(event)
}
}
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/guests/SetGuestPolicyMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/guests/SetGuestPolicyMsgHdlr.scala
index 755100195e0f4a33987ce8e6ed467e970b1a3fc0..d0f94f71555eaddcf270cf4c8a8245e867d7eb2f 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/guests/SetGuestPolicyMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/guests/SetGuestPolicyMsgHdlr.scala
@@ -24,8 +24,7 @@ trait SetGuestPolicyMsgHdlr extends RightsManagementTrait {
val policy = GuestPolicy(newPolicy, msg.body.setBy)
GuestsWaiting.setGuestPolicy(liveMeeting.guestsWaiting, policy)
val event = MsgBuilder.buildGuestPolicyChangedEvtMsg(
- liveMeeting.props.meetingProp.intId, msg.header.userId, newPolicy, msg.body.setBy
- )
+ liveMeeting.props.meetingProp.intId, msg.header.userId, newPolicy, msg.body.setBy)
outGW.send(event)
}
}
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/meeting/DestroyMeetingSysCmdMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/meeting/DestroyMeetingSysCmdMsgHdlr.scala
index 8fdc32e371ce255f0b602767c9a8c82ff9cfb5c8..d663ca47f6757e75e4fe74e8751a53d881c35725 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/meeting/DestroyMeetingSysCmdMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/meeting/DestroyMeetingSysCmdMsgHdlr.scala
@@ -16,8 +16,7 @@ trait DestroyMeetingSysCmdMsgHdlr {
if (liveMeeting.props.meetingProp.isBreakout) {
log.info(
"Informing parent meeting {} that a breakout room has been ended {}",
- liveMeeting.props.breakoutProps.parentId, liveMeeting.props.meetingProp.intId
- )
+ liveMeeting.props.breakoutProps.parentId, liveMeeting.props.meetingProp.intId)
// send out BreakoutRoomEndedEvtMsg to inform clients the breakout has ended
outGW.send(MsgBuilder.buildBreakoutRoomEndedEvtMsg(liveMeeting.props.meetingProp.intId, "not-used",
@@ -30,8 +29,7 @@ trait DestroyMeetingSysCmdMsgHdlr {
// Eject all users from the voice conference
outGW.send(MsgBuilder.buildEjectAllFromVoiceConfMsg(
liveMeeting.props.meetingProp.intId,
- liveMeeting.props.voiceProp.voiceConf
- ))
+ liveMeeting.props.voiceProp.voiceConf))
// send a system message to force disconnection
outGW.send(MsgBuilder.buildDisconnectAllClientsSysMsg(liveMeeting.props.meetingProp.intId, "meeting-destroyed"))
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
index 1b09b3cba5b8c0e524ed0e37399eb6e851e6e5e7..5a5a1424f59eaee4f6c91c2714e74bead3251766 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
@@ -31,8 +31,7 @@ class AppsRedisSubscriberActor(jsonMsgBus: IncomingJsonMessageBus, redisHost: St
channels: Seq[String] = Nil, patterns: Seq[String] = Nil)
extends RedisSubscriberActor(
new InetSocketAddress(redisHost, redisPort),
- channels, patterns, onConnectStatus = connected => { println(s"connected: $connected") }
- ) with SystemConfiguration {
+ channels, patterns, onConnectStatus = connected => { println(s"connected: $connected") }) with SystemConfiguration {
override val supervisorStrategy = OneForOneStrategy(maxNrOfRetries = 10, withinTimeRange = 1 minute) {
case e: Exception => {
diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
index 4a0d9c5f485979eb0887f2c9fa363547947c569d..7a01783d5b6448ad53fd98eb53a235f2829d284b 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
@@ -464,7 +464,7 @@ class RedisRecorderActor(val system: ActorSystem)
record(msg.header.meetingId, ev.toMap)
}
-
+
private def handleRecordStatusResetSysMsg(msg: RecordStatusResetSysMsg) {
val ev = new RecordStatusResetEvent()
ev.setMeetingId(msg.header.meetingId)
diff --git a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
index 11becef228b69b593e678b5d08774c05721297d0..4f969be0b6465347544e038f95917fa3c8a1794e 100755
--- a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
+++ b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
@@ -28,11 +28,13 @@ object AppsRedisSubscriberActor extends SystemConfiguration {
channels, patterns).withDispatcher("akka.rediscala-subscriber-worker-dispatcher")
}
-class AppsRedisSubscriberActor(val system: ActorSystem,
+class AppsRedisSubscriberActor(
+ val system: ActorSystem,
inJsonMgBus: InsonMsgBus, redisHost: String,
redisPort: Int,
- channels: Seq[String] = Nil, patterns: Seq[String] = Nil)
- extends RedisSubscriberActor(new InetSocketAddress(redisHost, redisPort),
+ channels: Seq[String] = Nil, patterns: Seq[String] = Nil)
+ extends RedisSubscriberActor(
+ new InetSocketAddress(redisHost, redisPort),
channels, patterns, onConnectStatus = connected => { println(s"connected: $connected") }) with SystemConfiguration {
override val supervisorStrategy = OneForOneStrategy(maxNrOfRetries = 10, withinTimeRange = 1 minute) {
diff --git a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
index 909c25a4c200b8591c6524b8019d6d1fd8e5d379..f82d08080087570a5b1102f2e972443904c10163 100755
--- a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
+++ b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
@@ -37,7 +37,7 @@ class VoiceConferenceService(sender: RedisPublisher) extends IVoiceConferenceSer
}
def userJoinedVoiceConf(voiceConfId: String, voiceUserId: String, userId: String, callerIdName: String,
- callerIdNum: String, muted: java.lang.Boolean, talking: java.lang.Boolean, avatarURL: String) {
+ callerIdNum: String, muted: java.lang.Boolean, talking: java.lang.Boolean, avatarURL: String) {
val header = BbbCoreVoiceConfHeader(UserJoinedVoiceConfEvtMsg.NAME, voiceConfId)
val body = UserJoinedVoiceConfEvtMsgBody(voiceConfId, voiceUserId, userId, callerIdName, callerIdNum,
diff --git a/bbb-apps-common/deploy.sh b/bbb-apps-common/deploy.sh
old mode 100644
new mode 100755
diff --git a/bbb-screenshare/app/deploy.sh b/bbb-screenshare/app/deploy.sh
index 305fe88e808b6757c8c69d22444e70de6b8ea388..a21a310dbb12dcf7258fdfd49cb43ee187c31545 100755
--- a/bbb-screenshare/app/deploy.sh
+++ b/bbb-screenshare/app/deploy.sh
@@ -17,7 +17,7 @@ sudo cp ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/bbb-sc
~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/jackson-* \
~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/paranamer-2.8.jar \
~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/akka-* \
- ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/config-1.3.1.jar \
+ ~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/config-1.3.3.jar \
~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/gson-2.8.5.jar \
~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/jedis-2.9.0.jar \
~/dev/bigbluebutton/bbb-screenshare/app/target/webapp/WEB-INF/lib/commons-pool2-2.6.0.jar \
diff --git a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/ScreenShareApplication.scala b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/ScreenShareApplication.scala
index e85699818a2f6118969cc943ca54a03120aa838d..cb3082f1a6e119ab56337eab61cfdacc2035430a 100755
--- a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/ScreenShareApplication.scala
+++ b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/ScreenShareApplication.scala
@@ -1,24 +1,24 @@
/**
-* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
-*
-* Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
-*
-* This program is free software; you can redistribute it and/or modify it under the
-* terms of the GNU Lesser General Public License as published by the Free Software
-* Foundation; either version 3.0 of the License, or (at your option) any later
-* version.
-*
-* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License along
-* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-*
-*/
+ * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
+ *
+ * Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
+ *
+ * This program is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 3.0 of the License, or (at your option) any later
+ * version.
+ *
+ * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+ *
+ */
package org.bigbluebutton.app.screenshare
-import scala.util.{Failure, Success}
+import scala.util.{ Failure, Success }
import akka.util.Timeout
import akka.pattern.ask
import org.bigbluebutton.app.screenshare.events.IEventsMessageBus
@@ -26,13 +26,13 @@ import org.bigbluebutton.app.screenshare.server.sessions.ScreenshareManager
import org.bigbluebutton.app.screenshare.server.sessions.messages._
import org.bigbluebutton.app.screenshare.server.util.LogHelper
import akka.actor.ActorSystem
-import org.bigbluebutton.app.screenshare.redis.{AppsRedisSubscriberActor, IncomingJsonMessageBus, ReceivedJsonMsgHandlerActor}
+import org.bigbluebutton.app.screenshare.redis.{ AppsRedisSubscriberActor, IncomingJsonMessageBus, ReceivedJsonMsgHandlerActor }
-import scala.concurrent.{Await, Future, TimeoutException}
+import scala.concurrent.{ Await, Future, TimeoutException }
import scala.concurrent.duration._
class ScreenShareApplication(val bus: IEventsMessageBus, val jnlpFile: String,
- val streamBaseUrl: String) extends IScreenShareApplication
+ val streamBaseUrl: String) extends IScreenShareApplication
with SystemConfiguration { //} with LogHelper {
implicit val system = ActorSystem("bbb-screenshare-system")
@@ -59,52 +59,51 @@ class ScreenShareApplication(val bus: IEventsMessageBus, val jnlpFile: String,
// logger.debug("ScreenShareApplication created.")
//}
-
def meetingHasEnded(meetingId: String) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("Received meetingHasEnded on meeting=" + meetingId + "]")
-// }
+ // if (logger.isDebugEnabled()) {
+ // logger.debug("Received meetingHasEnded on meeting=" + meetingId + "]")
+ // }
screenShareManager ! new MeetingEnded(meetingId)
}
def meetingCreated(meetingId: String, record: java.lang.Boolean) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("Received meetingCreated on meeting=" + meetingId + "]")
-// }
+ // if (logger.isDebugEnabled()) {
+ // logger.debug("Received meetingCreated on meeting=" + meetingId + "]")
+ // }
screenShareManager ! new MeetingCreated(meetingId, record)
}
def userConnected(meetingId: String, userId: String) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("Received user connected on meeting=" + meetingId
-// + "] userid=[" + userId + "]")
-// }
+ // if (logger.isDebugEnabled()) {
+ // logger.debug("Received user connected on meeting=" + meetingId
+ // + "] userid=[" + userId + "]")
+ // }
screenShareManager ! new UserConnected(meetingId, userId)
}
def userDisconnected(meetingId: String, userId: String) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("Received user disconnected on meeting=" + meetingId
-// + "] userid=[" + userId + "]")
-// }
+ // if (logger.isDebugEnabled()) {
+ // logger.debug("Received user disconnected on meeting=" + meetingId
+ // + "] userid=[" + userId + "]")
+ // }
screenShareManager ! new UserDisconnected(meetingId, userId)
}
def isScreenSharing(meetingId: String, userId: String) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("Received is screen sharing on meeting=" + meetingId + "]")
-// }
+ // if (logger.isDebugEnabled()) {
+ // logger.debug("Received is screen sharing on meeting=" + meetingId + "]")
+ // }
screenShareManager ! IsScreenSharing(meetingId, userId)
}
- def getScreenShareInfo(meetingId: String, token: String):ScreenShareInfoResponse = {
-// if (logger.isDebugEnabled()) {
-// logger.debug("Received get screen sharing info on token=" + token + "]")
-// }
+ def getScreenShareInfo(meetingId: String, token: String): ScreenShareInfoResponse = {
+ // if (logger.isDebugEnabled()) {
+ // logger.debug("Received get screen sharing info on token=" + token + "]")
+ // }
try {
val future = screenShareManager ? ScreenShareInfoRequest(meetingId, token)
@@ -115,9 +114,9 @@ class ScreenShareApplication(val bus: IEventsMessageBus, val jnlpFile: String,
new ScreenShareInfoResponse(info, null)
} catch {
case e: TimeoutException =>
- // if (logger.isDebugEnabled()) {
- // logger.debug("FAILED to get screen share info on meetingId=" + meetingId + "]")
- // }
+ // if (logger.isDebugEnabled()) {
+ // logger.debug("FAILED to get screen share info on meetingId=" + meetingId + "]")
+ // }
new ScreenShareInfoResponse(null, initError)
}
@@ -130,24 +129,23 @@ class ScreenShareApplication(val bus: IEventsMessageBus, val jnlpFile: String,
val reply = Await.result(future, timeout.duration).asInstanceOf[GetSharingStatusReply]
reply.streamId match {
- case Some(streamId) => new SharingStatus(reply.status, streamId)
+ case Some(streamId) => new SharingStatus(reply.status, streamId)
case None => new SharingStatus(reply.status, null)
}
} catch {
case e: TimeoutException =>
-// if (logger.isDebugEnabled()) {
-// logger.debug("FAILED to get sharing status on stream=" + streamId + "]")
-// }
+ // if (logger.isDebugEnabled()) {
+ // logger.debug("FAILED to get sharing status on stream=" + streamId + "]")
+ // }
new SharingStatus("STOP", null)
}
-
}
- def recordStream(meetingId: String, streamId: String):java.lang.Boolean = {
-// if (logger.isDebugEnabled()) {
-// logger.debug("Received record stream request on stream=" + streamId + "]")
-// }
+ def recordStream(meetingId: String, streamId: String): java.lang.Boolean = {
+ // if (logger.isDebugEnabled()) {
+ // logger.debug("Received record stream request on stream=" + streamId + "]")
+ // }
var record = false
@@ -155,14 +153,14 @@ class ScreenShareApplication(val bus: IEventsMessageBus, val jnlpFile: String,
val future = screenShareManager ? IsStreamRecorded(meetingId, streamId)
val reply = Await.result(future, timeout.duration).asInstanceOf[IsStreamRecordedReply]
record = reply.record
-// if (logger.isDebugEnabled()) {
-// logger.debug("Received response SUCCESS request on stream=" + streamId + "]")
-// }
+ // if (logger.isDebugEnabled()) {
+ // logger.debug("Received response SUCCESS request on stream=" + streamId + "]")
+ // }
} catch {
case e: TimeoutException =>
-// if (logger.isDebugEnabled()) {
-// logger.debug("FAILED to get is stream recorded on stream=" + streamId + "]")
-// }
+ // if (logger.isDebugEnabled()) {
+ // logger.debug("FAILED to get is stream recorded on stream=" + streamId + "]")
+ // }
record = false
}
@@ -171,89 +169,87 @@ class ScreenShareApplication(val bus: IEventsMessageBus, val jnlpFile: String,
}
def requestShareToken(meetingId: String, userId: String, record: java.lang.Boolean, tunnel: java.lang.Boolean) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("Received request share token on meeting=" + meetingId + "for user=" + userId + "]")
-// }
+ // if (logger.isDebugEnabled()) {
+ // logger.debug("Received request share token on meeting=" + meetingId + "for user=" + userId + "]")
+ // }
screenShareManager ! RequestShareTokenMessage(meetingId, userId, jnlpFile, record, tunnel)
}
def startShareRequest(meetingId: String, userId: String, session: String) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("Received start share request on meeting=" + meetingId + "for user=" + userId + "]")
-// }
+ // if (logger.isDebugEnabled()) {
+ // logger.debug("Received start share request on meeting=" + meetingId + "for user=" + userId + "]")
+ // }
screenShareManager ! StartShareRequestMessage(meetingId, userId, session)
}
def restartShareRequest(meetingId: String, userId: String) {
-// if (logger.isDebugEnabled()) {
- // logger.debug("Received restart share request on meeting=[" + meetingId
- // + "] from userId=[" + userId + "]")
- // }
+ // if (logger.isDebugEnabled()) {
+ // logger.debug("Received restart share request on meeting=[" + meetingId
+ // + "] from userId=[" + userId + "]")
+ // }
screenShareManager ! new RestartShareRequestMessage(meetingId, userId)
}
def pauseShareRequest(meetingId: String, userId: String, streamId: String) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("Received pause share request on meeting=[" + meetingId
-// + "] for stream=[" + streamId + "]")
-// }
+ // if (logger.isDebugEnabled()) {
+ // logger.debug("Received pause share request on meeting=[" + meetingId
+ // + "] for stream=[" + streamId + "]")
+ // }
screenShareManager ! new PauseShareRequestMessage(meetingId, userId, streamId)
}
def stopShareRequest(meetingId: String, streamId: String) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("Received stop share request on meeting=[" + meetingId
-// + "] for stream=[" + streamId + "]")
-// }
+ // if (logger.isDebugEnabled()) {
+ // logger.debug("Received stop share request on meeting=[" + meetingId
+ // + "] for stream=[" + streamId + "]")
+ // }
screenShareManager ! new StopShareRequestMessage(meetingId, streamId)
}
def streamStarted(meetingId: String, streamId: String, url: String) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("Received stream started on meeting=[" + meetingId
-// + "] for stream=[" + streamId + "]")
-// }
+ // if (logger.isDebugEnabled()) {
+ // logger.debug("Received stream started on meeting=[" + meetingId
+ // + "] for stream=[" + streamId + "]")
+ // }
screenShareManager ! new StreamStartedMessage(meetingId, streamId, url)
}
def authorizeBroadcastStream(meetingId: String, streamId: String, connId: String, scope: String): Unit = {
- screenShareManager ! new AuthorizeBroadcastStreamMessage(meetingId, streamId, connId, scope)
- }
+ screenShareManager ! new AuthorizeBroadcastStreamMessage(meetingId, streamId, connId, scope)
+ }
def streamStopped(meetingId: String, streamId: String) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("Received stream stopped on meeting=[" + meetingId
-// + "] for stream=[" + streamId + "]")
-// }
+ // if (logger.isDebugEnabled()) {
+ // logger.debug("Received stream stopped on meeting=[" + meetingId
+ // + "] for stream=[" + streamId + "]")
+ // }
screenShareManager ! new StreamStoppedMessage(meetingId, streamId)
}
def sharingStarted(meetingId: String, streamId: String, width: java.lang.Integer, height: java.lang.Integer) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("Received share started on meeting=[" + meetingId
-// + "] for stream=[" + streamId + "] with region=[" + width + "x" + height + "]")
-// }
+ // if (logger.isDebugEnabled()) {
+ // logger.debug("Received share started on meeting=[" + meetingId
+ // + "] for stream=[" + streamId + "] with region=[" + width + "x" + height + "]")
+ // }
screenShareManager ! new SharingStartedMessage(meetingId, streamId, width, height)
}
def sharingStopped(meetingId: String, streamId: String) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("Received sharing stopped on meeting=" + meetingId
-// + "for stream=" + streamId + "]")
-// }
+ // if (logger.isDebugEnabled()) {
+ // logger.debug("Received sharing stopped on meeting=" + meetingId
+ // + "for stream=" + streamId + "]")
+ // }
screenShareManager ! new SharingStoppedMessage(meetingId, streamId)
}
- def updateShareStatus(meetingId: String, streamId : String, seqNum: java.lang.Integer) {
+ def updateShareStatus(meetingId: String, streamId: String, seqNum: java.lang.Integer) {
screenShareManager ! new UpdateShareStatus(meetingId, streamId, seqNum)
}
-
-
- def screenShareClientPongMessage (meetingId: String, userId: String, streamId: String, timestamp: java.lang.Long) {
+ def screenShareClientPongMessage(meetingId: String, userId: String, streamId: String, timestamp: java.lang.Long) {
screenShareManager ! new ClientPongMessage(meetingId, userId, streamId, timestamp)
}
}
\ No newline at end of file
diff --git a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/SystemConfiguration.scala b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/SystemConfiguration.scala
index 6c27b71e2e4ff40aac60d72085a1507c73877aa2..c25b684048db28d44b04cc90e5eef302c56ccb50 100755
--- a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/SystemConfiguration.scala
+++ b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/SystemConfiguration.scala
@@ -14,7 +14,6 @@ trait SystemConfiguration {
lazy val meetingManagerChannel = Try(config.getString("eventBus.meetingManagerChannel")).getOrElse("NOT FROM APP CONF")
-
lazy val toScreenshareAppsJsonChannel = Try(config.getString("eventBus.toAkkaAppsChannel")).getOrElse("to-screenshare-apps-json-channel")
lazy val fromAkkaAppsRedisChannel = Try(config.getString("redis.fromAkkaAppsRedisChannel")).getOrElse("from-akka-apps-redis-channel")
}
diff --git a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/redis/AppsRedisSubscriberActor.scala b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/redis/AppsRedisSubscriberActor.scala
index 681866ba6718715d1b30c96019e6f019c027b5e8..36bbc477fc0d0201f1a875f03bdb1dbad7599324 100755
--- a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/redis/AppsRedisSubscriberActor.scala
+++ b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/redis/AppsRedisSubscriberActor.scala
@@ -1,9 +1,9 @@
package org.bigbluebutton.app.screenshare.redis
-import java.io.{PrintWriter, StringWriter}
+import java.io.{ PrintWriter, StringWriter }
import java.net.InetSocketAddress
-import akka.actor.{OneForOneStrategy, Props}
+import akka.actor.{ OneForOneStrategy, Props }
import akka.actor.SupervisorStrategy.Resume
import org.bigbluebutton.app.screenshare.SystemConfiguration
import redis.actors.RedisSubscriberActor
@@ -12,7 +12,7 @@ import redis.actors.RedisSubscriberActor
import redis.api.pubsub.{ Message, PMessage }
import scala.concurrent.duration._
-object AppsRedisSubscriberActor extends SystemConfiguration{
+object AppsRedisSubscriberActor extends SystemConfiguration {
val channels = Seq(fromAkkaAppsRedisChannel)
val patterns = Seq("bigbluebutton:to-bbb-apps:*", "bigbluebutton:from-voice-conf:*")
@@ -26,8 +26,9 @@ object AppsRedisSubscriberActor extends SystemConfiguration{
class AppsRedisSubscriberActor(jsonMsgBus: IncomingJsonMessageBus, redisHost: String,
redisPort: Int,
channels: Seq[String] = Nil, patterns: Seq[String] = Nil)
- extends RedisSubscriberActor(new InetSocketAddress(redisHost, redisPort),
- channels, patterns, onConnectStatus = connected => { println(s"connected: $connected") }) with SystemConfiguration {
+ extends RedisSubscriberActor(
+ new InetSocketAddress(redisHost, redisPort),
+ channels, patterns, onConnectStatus = connected => { println(s"connected: $connected") }) with SystemConfiguration {
override val supervisorStrategy = OneForOneStrategy(maxNrOfRetries = 10, withinTimeRange = 1 minute) {
case e: Exception => {
diff --git a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/redis/ReceivedJsonMsgHandlerActor.scala b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/redis/ReceivedJsonMsgHandlerActor.scala
index 7bc9e89f34ad0c3e18d7b5ee751e2fc4fee460cc..36d638988c3a31b63c4149b6f53b8cd2b6db2af0 100755
--- a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/redis/ReceivedJsonMsgHandlerActor.scala
+++ b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/redis/ReceivedJsonMsgHandlerActor.scala
@@ -1,19 +1,19 @@
package org.bigbluebutton.app.screenshare.redis
import com.fasterxml.jackson.databind.JsonNode
-import org.bigbluebutton.app.screenshare.server.sessions.messages.{MeetingCreated, MeetingEnded, RecordingChapterBreak}
-import akka.actor.{Actor, ActorLogging, ActorRef, Props}
+import org.bigbluebutton.app.screenshare.server.sessions.messages.{ MeetingCreated, MeetingEnded, RecordingChapterBreak }
+import akka.actor.{ Actor, ActorLogging, ActorRef, Props }
import scala.reflect.runtime.universe._
import org.bigbluebutton.common2.msgs._
object ReceivedJsonMsgHandlerActor {
- def props(screenshareManager: ActorRef ): Props =
+ def props(screenshareManager: ActorRef): Props =
Props(classOf[ReceivedJsonMsgHandlerActor], screenshareManager)
}
class ReceivedJsonMsgHandlerActor(screenshareManager: ActorRef)
- extends Actor with ActorLogging {
+ extends Actor with ActorLogging {
object JsonDeserializer extends Deserializer
@@ -63,7 +63,7 @@ class ReceivedJsonMsgHandlerActor(screenshareManager: ActorRef)
screenshareManager ! new RecordingChapterBreak(m.body.meetingId, m.body.timestamp)
}
case _ =>
- // log.error("Cannot route envelope name " + envelope.name)
+ // log.error("Cannot route envelope name " + envelope.name)
// do nothing
}
}
diff --git a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/ActiveScreenshare.scala b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/ActiveScreenshare.scala
index 578cf332241c9ee475c4430a2d2236f5560da2f7..3e9f61c7e073a791da3f245c61d76fb810af9782 100755
--- a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/ActiveScreenshare.scala
+++ b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/ActiveScreenshare.scala
@@ -6,11 +6,12 @@ import org.bigbluebutton.app.screenshare.events.IEventsMessageBus
object ActiveScreenshare {
def apply(screenshareSessionManager: ScreenshareManager, bus: IEventsMessageBus,
- meetingId:String, record: Boolean)(implicit context: ActorContext) =
+ meetingId: String, record: Boolean)(implicit context: ActorContext) =
new ActiveScreenshare(screenshareSessionManager, bus, meetingId, record)(context)
}
-class ActiveScreenshare(val screenshareSessionManager: ScreenshareManager,
- val bus: IEventsMessageBus, val meetingId:String, record: Boolean)(implicit val context: ActorContext) {
+class ActiveScreenshare(
+ val screenshareSessionManager: ScreenshareManager,
+ val bus: IEventsMessageBus, val meetingId: String, record: Boolean)(implicit val context: ActorContext) {
val actorRef = context.actorOf(Screenshare.props(screenshareSessionManager, bus, meetingId, record))
}
diff --git a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/ActiveSession.scala b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/ActiveSession.scala
index 3790a60d92317c045798d3a50af937dc942341aa..231c8859caae99afda8c1248fe1eec56c0531362 100755
--- a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/ActiveSession.scala
+++ b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/ActiveSession.scala
@@ -6,12 +6,12 @@ import org.bigbluebutton.app.screenshare.events.IEventsMessageBus
object ActiveSession {
def apply(parent: Screenshare, bus: IEventsMessageBus, meetingId: String, streamId: String,
- token: String, recorded: Boolean, userId: String, tunnel: Boolean)(implicit context: ActorContext) =
+ token: String, recorded: Boolean, userId: String, tunnel: Boolean)(implicit context: ActorContext) =
new ActiveSession(parent, bus, meetingId, streamId, token, recorded, userId, tunnel)(context)
}
class ActiveSession(parent: Screenshare, bus: IEventsMessageBus, val meetingId: String,
- val streamId: String, val token: String, val recorded: Boolean,
- val userId: String, val tunnel: Boolean)(implicit val context: ActorContext) {
-// val actorRef = context.actorOf(Session.props(parent, bus, meetingId, streamId, token, recorded, userId))
+ val streamId: String, val token: String, val recorded: Boolean,
+ val userId: String, val tunnel: Boolean)(implicit val context: ActorContext) {
+ // val actorRef = context.actorOf(Session.props(parent, bus, meetingId, streamId, token, recorded, userId))
}
diff --git a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/Screenshare.scala b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/Screenshare.scala
index 6940a8b7c838df4fd6bad124b928da34cdb1c635..a3897b385e46d89adc96e658ce20c4aa49a209a9 100755
--- a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/Screenshare.scala
+++ b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/Screenshare.scala
@@ -1,24 +1,23 @@
/**
-* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
-*
-* Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
-*
-* This program is free software; you can redistribute it and/or modify it under the
-* terms of the GNU Lesser General Public License as published by the Free Software
-* Foundation; either version 3.0 of the License, or (at your option) any later
-* version.
-*
-* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License along
-* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-*
-*/
+ * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
+ *
+ * Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
+ *
+ * This program is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 3.0 of the License, or (at your option) any later
+ * version.
+ *
+ * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+ *
+ */
package org.bigbluebutton.app.screenshare.server.sessions
-
import org.bigbluebutton.app.screenshare.StreamInfo
import akka.actor.Actor
import akka.actor.ActorRef
@@ -26,14 +25,13 @@ import akka.actor.ActorLogging
import akka.actor.Props
import scala.collection.mutable.HashMap
import org.bigbluebutton.app.screenshare.events._
-import org.bigbluebutton.app.screenshare.server.sessions.ScreenShareAuditInternal.{StartSendingAudit, StopSendingAudit}
+import org.bigbluebutton.app.screenshare.server.sessions.ScreenShareAuditInternal.{ StartSendingAudit, StopSendingAudit }
import org.bigbluebutton.app.screenshare.server.sessions.Screenshare.SessionAuditMessage
-import org.bigbluebutton.app.screenshare.server.sessions.messages.{StartShareRequestMessage, _}
+import org.bigbluebutton.app.screenshare.server.sessions.messages.{ StartShareRequestMessage, _ }
import org.bigbluebutton.app.screenshare.server.util.TimeUtil
import scala.concurrent.duration._
import scala.collection.immutable.StringOps
-
object ScreenShareAuditInternal {
case class StartSendingAudit(session: String)
@@ -43,7 +41,7 @@ object ScreenShareAuditInternal {
Props(classOf[ScreenShareAuditInternal], meetingId)
}
-class ScreenShareAuditInternal (meetingId: String) extends Actor with ActorLogging {
+class ScreenShareAuditInternal(meetingId: String) extends Actor with ActorLogging {
import context.dispatcher
context.system.scheduler.schedule(2 seconds, 5 seconds, self, "SendInternalScreenShareSessionAudit")
@@ -53,7 +51,7 @@ class ScreenShareAuditInternal (meetingId: String) extends Actor with ActorLoggi
def receive = {
case "SendInternalScreenShareSessionAudit" => handleSendInternalScreenShareSessionAudit()
- case msg:StartSendingAudit =>
+ case msg: StartSendingAudit =>
sendAudit = true
session = Some(msg.session)
case msg: StopSendingAudit =>
@@ -62,29 +60,28 @@ class ScreenShareAuditInternal (meetingId: String) extends Actor with ActorLoggi
}
private def handleSendInternalScreenShareSessionAudit(): Unit = {
- if (sendAudit) {
- session foreach { s =>
- context.parent ! SessionAuditMessage(s)
- }
+ if (sendAudit) {
+ session foreach { s =>
+ context.parent ! SessionAuditMessage(s)
+ }
- }
+ }
}
}
-
-
object Screenshare {
- def props(screenshareSessionManager: ScreenshareManager, bus: IEventsMessageBus, meetingId:String, record: Boolean): Props =
+ def props(screenshareSessionManager: ScreenshareManager, bus: IEventsMessageBus, meetingId: String, record: Boolean): Props =
Props(classOf[Screenshare], screenshareSessionManager, bus, meetingId, record)
case class SessionAuditMessage(session: String)
case class KeepAliveTimeout(streamId: String, stopSharing: Boolean)
}
-class Screenshare(val sessionManager: ScreenshareManager,
- val bus: IEventsMessageBus,
- val meetingId: String, val record: Boolean) extends Actor with ActorLogging {
+class Screenshare(
+ val sessionManager: ScreenshareManager,
+ val bus: IEventsMessageBus,
+ val meetingId: String, val record: Boolean) extends Actor with ActorLogging {
log.info("Creating a new Screenshare for meetingId={}", meetingId)
@@ -103,26 +100,24 @@ class Screenshare(val sessionManager: ScreenshareManager,
// start-pause-stop
private var streamIdCount = 0
- // A screen sharing session that has lifecyle of start, pause, resume, and stop.
+ // A screen sharing session that has lifecyle of start, pause, resume, and stop.
private var screenShareSession: Option[String] = None
- // A broadcast stream session withing the screen share session.
- private var activeSession:Option[ActiveSession] = None
+ // A broadcast stream session withing the screen share session.
+ private var activeSession: Option[ActiveSession] = None
-
- private var currentPresenterId: Option[String] = None
+ private var currentPresenterId: Option[String] = None
private var width: Option[Int] = None
private var height: Option[Int] = None
private var streamUrl: Option[String] = None
-
// Number of seconds before we assume that the JWS is dead.
private val LAST_JWS_STATUS_UPDATE_TIMEOUT = 10
private var lastJwsStatusUpdate = 0L
- private var sessionStartedTimestamp:Long = 0L
+ private var sessionStartedTimestamp: Long = 0L
private val JWS_START_TIMEOUT = 90
// The number of seconds we wait for the JWS to launch when
@@ -138,7 +133,6 @@ class Screenshare(val sessionManager: ScreenshareManager,
private var lastClientPongReceivedTimestamp = 0L
private val PONG_TIMEOUT_SEC = 20
-
private val MEETING_ENDED_REASON = "MEETING_ENDED_REASON"
private val JWS_GONE_REASON = "JWS_GONE_REASON"
private val CLIENT_GONE_REASON = "CLIENT_GONE_REASON"
@@ -169,21 +163,20 @@ class Screenshare(val sessionManager: ScreenshareManager,
case msg: UserDisconnected => handleUserDisconnected(msg)
case msg: UserConnected => handleUserConnected(msg)
case msg: ScreenShareInfoRequest => handleScreenShareInfoRequest(msg)
- case msg: MeetingEnded => handleMeetingHasEnded(msg)
+ case msg: MeetingEnded => handleMeetingHasEnded(msg)
case msg: SessionAuditMessage => handleSessionAuditMessage(msg)
- case msg: ClientPongMessage => handleClientPongMessage(msg)
+ case msg: ClientPongMessage => handleClientPongMessage(msg)
case msg: AuthorizeBroadcastStreamMessage => handleAuthorizeBroadcastStreamMessage(msg)
case m: Any => log.warning("Session: Unknown message [{}]", m)
}
-
private def handleClientPongMessage(msg: ClientPongMessage) {
if (log.isDebugEnabled) {
log.debug("Received ClientPongMessage message for streamId=[" + msg.streamId + "]")
}
- activeSession foreach {as =>
+ activeSession foreach { as =>
if (as.streamId == msg.streamId) {
lastClientPongReceivedTimestamp = TimeUtil.currentMonoTimeInSeconds()
}
@@ -204,8 +197,7 @@ class Screenshare(val sessionManager: ScreenshareManager,
context.stop(self)
}
-
- private def trimUserId2(userId: String):Option[String] = {
+ private def trimUserId2(userId: String): Option[String] = {
// A userId has the format "abc123_1" where "_1" refers to the number
// of times the user rejoins due to disconnect. We strip off that number
// to get the real userId so we can map the screen sharing session to the
@@ -292,7 +284,7 @@ class Screenshare(val sessionManager: ScreenshareManager,
}
}
}
-
+
private def handleIsStreamRecorded(msg: IsStreamRecorded) {
if (log.isDebugEnabled) {
log.debug("Received IsStreamRecorded for streamId=[" + msg.streamId + "]")
@@ -390,18 +382,18 @@ class Screenshare(val sessionManager: ScreenshareManager,
}
private def handleAuthorizeBroadcastStreamMessage(msg: AuthorizeBroadcastStreamMessage): Unit = {
- if (log.isDebugEnabled) {
- log.debug("handleAuthorizeBroadcastStreamMessage meetingId=" + msg.meetingId +
- " streamId=" + msg.streamId + " connId=" + msg.connId + " scope=" + msg.scope)
- }
-
- activeSession match {
- case Some(as) =>
- if (as.streamId != msg.streamId) {
- bus.send(new UnauthorizedBroadcastStreamEvent(msg.meetingId, msg.streamId, msg.connId, msg.scope))
- }
- case None => bus.send(new UnauthorizedBroadcastStreamEvent(msg.meetingId, msg.streamId, msg.connId, msg.scope))
- }
+ if (log.isDebugEnabled) {
+ log.debug("handleAuthorizeBroadcastStreamMessage meetingId=" + msg.meetingId +
+ " streamId=" + msg.streamId + " connId=" + msg.connId + " scope=" + msg.scope)
+ }
+
+ activeSession match {
+ case Some(as) =>
+ if (as.streamId != msg.streamId) {
+ bus.send(new UnauthorizedBroadcastStreamEvent(msg.meetingId, msg.streamId, msg.connId, msg.scope))
+ }
+ case None => bus.send(new UnauthorizedBroadcastStreamEvent(msg.meetingId, msg.streamId, msg.connId, msg.scope))
+ }
}
private def resetScreenShareSession() = {
@@ -423,7 +415,6 @@ class Screenshare(val sessionManager: ScreenshareManager,
stopScreenSharing(sss, NORMAL_REASON)
}
-
}
private def handlePauseShareRequestMessage(msg: PauseShareRequestMessage) {
@@ -437,7 +428,7 @@ class Screenshare(val sessionManager: ScreenshareManager,
} yield {
if (as.streamId == msg.streamId) {
status = PAUSE
- if (! isStreaming(streamUrl)) {
+ if (!isStreaming(streamUrl)) {
log.info("Sending screen share paused event for session=" + sss)
bus.send(new ScreenSharePausedEvent(meetingId, sss))
resetScreenShareSession()
@@ -478,14 +469,14 @@ class Screenshare(val sessionManager: ScreenshareManager,
def genSessionToken(): String = {
meetingId + "-" + System.currentTimeMillis()
}
- def generateStreamId(sessionToken: String):String = {
+ def generateStreamId(sessionToken: String): String = {
val streamId = sessionToken + "-" + streamIdCount
streamIdCount = streamIdCount + 1
streamId
}
val sessionToken = genSessionToken()
- screenShareSession = Some(sessionToken)
+ screenShareSession = Some(sessionToken)
val streamId = generateStreamId(sessionToken)
val token = streamId
@@ -556,7 +547,7 @@ class Screenshare(val sessionManager: ScreenshareManager,
}
screenShareSession foreach { sss =>
- if (! msg.streamId.startsWith(sss)) {
+ if (!msg.streamId.startsWith(sss)) {
processStaleSession()
} else {
if (status == PAUSE) {
@@ -575,7 +566,7 @@ class Screenshare(val sessionManager: ScreenshareManager,
}
}
- private def stopScreenSharing(session : String, reason: String): Unit = {
+ private def stopScreenSharing(session: String, reason: String): Unit = {
screenShareSession foreach { sss =>
if (session == sss) {
bus.send(new ScreenShareStoppedEvent(meetingId, sss, reason))
@@ -609,57 +600,56 @@ class Screenshare(val sessionManager: ScreenshareManager,
}
private def jwsStarted(session: String): Boolean = {
- val currentTimeInSec = TimeUtil.currentMonoTimeInSeconds()
- if ((status == START) && (currentTimeInSec - sessionStartedTimestamp > jwsLaunchTimeout)) {
- log.warning("JWS failed to start for meetingId=" + meetingId + ",session=" + session)
- stopScreenSharing(session, JWS_START_FAILED_REASON)
- false
- } else {
- true
- }
+ val currentTimeInSec = TimeUtil.currentMonoTimeInSeconds()
+ if ((status == START) && (currentTimeInSec - sessionStartedTimestamp > jwsLaunchTimeout)) {
+ log.warning("JWS failed to start for meetingId=" + meetingId + ",session=" + session)
+ stopScreenSharing(session, JWS_START_FAILED_REASON)
+ false
+ } else {
+ true
+ }
}
-
private def isJwsStillAlive(session: String): Boolean = {
- val currentTimeInSec = TimeUtil.currentMonoTimeInSeconds()
-
- if ((status == RUNNING || status == PAUSE) && (lastJwsStatusUpdate > 0) &&
- (currentTimeInSec - lastJwsStatusUpdate > LAST_JWS_STATUS_UPDATE_TIMEOUT)) {
- log.warning("Did not receive status update from JWS. Assume JWS crashed for meetingId=" +
- meetingId + ",session=" + session)
- stopScreenSharing(session, JWS_GONE_REASON)
- false
- } else {
- if (log.isDebugEnabled) {
- log.debug("JWS still alive. status=" + status + ";currentTimeInSec=" + currentTimeInSec + ";lastJwsStatusUpdate=" + lastJwsStatusUpdate +
- ";timeout=" + (currentTimeInSec - lastJwsStatusUpdate))
- }
- true
+ val currentTimeInSec = TimeUtil.currentMonoTimeInSeconds()
+
+ if ((status == RUNNING || status == PAUSE) && (lastJwsStatusUpdate > 0) &&
+ (currentTimeInSec - lastJwsStatusUpdate > LAST_JWS_STATUS_UPDATE_TIMEOUT)) {
+ log.warning("Did not receive status update from JWS. Assume JWS crashed for meetingId=" +
+ meetingId + ",session=" + session)
+ stopScreenSharing(session, JWS_GONE_REASON)
+ false
+ } else {
+ if (log.isDebugEnabled) {
+ log.debug("JWS still alive. status=" + status + ";currentTimeInSec=" + currentTimeInSec + ";lastJwsStatusUpdate=" + lastJwsStatusUpdate +
+ ";timeout=" + (currentTimeInSec - lastJwsStatusUpdate))
}
+ true
+ }
}
private def isClientStillAlive(session: String): Boolean = {
- val currentTimeInSec = TimeUtil.currentMonoTimeInSeconds()
- if ((lastClientPongReceivedTimestamp > 0) && (currentTimeInSec - lastClientPongReceivedTimestamp > PONG_TIMEOUT_SEC)) {
- log.warning("Did not receive pong from client. Assume client crashed for meetingId=" +
- meetingId + ",streamId=" + session)
- stopScreenSharing(session, CLIENT_GONE_REASON)
- false
- } else {
- for {
- sss <- screenShareSession
- presenterId <- currentPresenterId
- } yield (bus.send(new ScreenShareClientPing(meetingId, presenterId, sss, currentTimeInSec)))
+ val currentTimeInSec = TimeUtil.currentMonoTimeInSeconds()
+ if ((lastClientPongReceivedTimestamp > 0) && (currentTimeInSec - lastClientPongReceivedTimestamp > PONG_TIMEOUT_SEC)) {
+ log.warning("Did not receive pong from client. Assume client crashed for meetingId=" +
+ meetingId + ",streamId=" + session)
+ stopScreenSharing(session, CLIENT_GONE_REASON)
+ false
+ } else {
+ for {
+ sss <- screenShareSession
+ presenterId <- currentPresenterId
+ } yield (bus.send(new ScreenShareClientPing(meetingId, presenterId, sss, currentTimeInSec)))
- true
- }
+ true
+ }
}
private def isStreaming(streamUrl: Option[String]): Boolean = {
- streamUrl match {
- case Some(url) => true
- case None => false
- }
+ streamUrl match {
+ case Some(url) => true
+ case None => false
+ }
}
}
\ No newline at end of file
diff --git a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/ScreenshareManager.scala b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/ScreenshareManager.scala
index cd1b2bcdbce3041a3ded8ea6c170f361717bb96e..168b4d8c9d25a4ecbef7731899a39f24c6dc76c2 100755
--- a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/ScreenshareManager.scala
+++ b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/ScreenshareManager.scala
@@ -1,13 +1,13 @@
/**
* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
- *
+ *
* Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
*
* This program is free software; you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
* Foundation; either version 3.0 of the License, or (at your option) any later
* version.
- *
+ *
* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
@@ -20,7 +20,7 @@ package org.bigbluebutton.app.screenshare.server.sessions
import org.bigbluebutton.app.screenshare.StreamInfo
import org.bigbluebutton.app.screenshare.server.sessions.Session.StopSession
-import akka.actor.{Actor, ActorLogging, ActorSystem, Props}
+import akka.actor.{ Actor, ActorLogging, ActorSystem, Props }
import scala.collection.mutable.HashMap
import org.bigbluebutton.app.screenshare.events._
@@ -28,37 +28,37 @@ import org.bigbluebutton.app.screenshare.server.sessions.messages._
object ScreenshareManager {
def props(system: ActorSystem, bus: IEventsMessageBus): Props =
- Props(classOf[ScreenshareManager], system, bus)
+ Props(classOf[ScreenshareManager], system, bus)
}
class ScreenshareManager(val aSystem: ActorSystem, val bus: IEventsMessageBus)
- extends Actor with ActorLogging {
+ extends Actor with ActorLogging {
log.info("Creating a new ScreenshareManager")
private val screenshares = new HashMap[String, ActiveScreenshare]
val actorSystem = aSystem //TODO remove
def receive = {
- case msg: RestartShareRequestMessage => handleRestartShareRequestMessage(msg)
- case msg: PauseShareRequestMessage => handlePauseShareRequestMessage(msg)
- case msg: RequestShareTokenMessage => handleRequestShareTokenMessage(msg)
- case msg: StartShareRequestMessage => handleStartShareRequestMessage(msg)
- case msg: StopShareRequestMessage => handleStopShareRequestMessage(msg)
- case msg: StreamStartedMessage => handleStreamStartedMessage(msg)
- case msg: StreamStoppedMessage => handleStreamStoppedMessage(msg)
- case msg: SharingStartedMessage => handleSharingStartedMessage(msg)
- case msg: SharingStoppedMessage => handleSharingStoppedMessage(msg)
- case msg: IsStreamRecorded => handleIsStreamRecorded(msg)
- case msg: GetSharingStatus => handleGetSharingStatus(msg)
- case msg: IsScreenSharing => handleIsScreenSharing(msg)
- case msg: ScreenShareInfoRequest => handleScreenShareInfoRequest(msg)
- case msg: UpdateShareStatus => handleUpdateShareStatus(msg)
- case msg: UserDisconnected => handleUserDisconnected(msg)
- case msg: UserConnected => handleUserConnected(msg)
- case msg: MeetingEnded => handleMeetingHasEnded(msg)
- case msg: MeetingCreated => handleMeetingCreated(msg)
- case msg: ClientPongMessage => handleClientPongMessage(msg)
- case msg: RecordingChapterBreak => handleRecordingChapterBreak(msg)
+ case msg: RestartShareRequestMessage => handleRestartShareRequestMessage(msg)
+ case msg: PauseShareRequestMessage => handlePauseShareRequestMessage(msg)
+ case msg: RequestShareTokenMessage => handleRequestShareTokenMessage(msg)
+ case msg: StartShareRequestMessage => handleStartShareRequestMessage(msg)
+ case msg: StopShareRequestMessage => handleStopShareRequestMessage(msg)
+ case msg: StreamStartedMessage => handleStreamStartedMessage(msg)
+ case msg: StreamStoppedMessage => handleStreamStoppedMessage(msg)
+ case msg: SharingStartedMessage => handleSharingStartedMessage(msg)
+ case msg: SharingStoppedMessage => handleSharingStoppedMessage(msg)
+ case msg: IsStreamRecorded => handleIsStreamRecorded(msg)
+ case msg: GetSharingStatus => handleGetSharingStatus(msg)
+ case msg: IsScreenSharing => handleIsScreenSharing(msg)
+ case msg: ScreenShareInfoRequest => handleScreenShareInfoRequest(msg)
+ case msg: UpdateShareStatus => handleUpdateShareStatus(msg)
+ case msg: UserDisconnected => handleUserDisconnected(msg)
+ case msg: UserConnected => handleUserConnected(msg)
+ case msg: MeetingEnded => handleMeetingHasEnded(msg)
+ case msg: MeetingCreated => handleMeetingCreated(msg)
+ case msg: ClientPongMessage => handleClientPongMessage(msg)
+ case msg: RecordingChapterBreak => handleRecordingChapterBreak(msg)
case msg: AuthorizeBroadcastStreamMessage => handleAuthorizeBroadcastStreamMessage(msg)
case msg: Any => log.warning("Unknown message " + msg)
@@ -213,17 +213,17 @@ class ScreenshareManager(val aSystem: ActorSystem, val bus: IEventsMessageBus)
}
private def handleAuthorizeBroadcastStreamMessage(msg: AuthorizeBroadcastStreamMessage): Unit = {
- if (log.isDebugEnabled) {
- log.debug("handleAuthorizeBroadcastStreamMessage meetingId=" + msg.meetingId +
- " streamId=" + msg.streamId + " connId=" + msg.connId + " scope=" + msg.scope)
- }
-
- screenshares.get(msg.meetingId) match {
- case Some(ss) =>
- ss.actorRef forward msg
- case None =>
- bus.send(new UnauthorizedBroadcastStreamEvent(msg.meetingId, msg.streamId, msg.connId, msg.scope))
- }
+ if (log.isDebugEnabled) {
+ log.debug("handleAuthorizeBroadcastStreamMessage meetingId=" + msg.meetingId +
+ " streamId=" + msg.streamId + " connId=" + msg.connId + " scope=" + msg.scope)
+ }
+
+ screenshares.get(msg.meetingId) match {
+ case Some(ss) =>
+ ss.actorRef forward msg
+ case None =>
+ bus.send(new UnauthorizedBroadcastStreamEvent(msg.meetingId, msg.streamId, msg.connId, msg.scope))
+ }
}
private def handleStopShareRequestMessage(msg: StopShareRequestMessage) {
@@ -299,7 +299,7 @@ class ScreenshareManager(val aSystem: ActorSystem, val bus: IEventsMessageBus)
log.debug("SessionManager: Removing session " + meetingId)
screenshares.get(meetingId) foreach { s =>
s.actorRef ! StopSession
- val old:Int = screenshares.size
+ val old: Int = screenshares.size
screenshares -= meetingId
log.debug("RemoveSession: Session length [%d,%d]", old, screenshares.size)
}
diff --git a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/Session.scala b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/Session.scala
index b13c9396ec4afd3ba2d03fd326cb647085284b8e..9b6a87ac85a9fca3bccc2b2c747a9ecc19de0b98 100755
--- a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/Session.scala
+++ b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/Session.scala
@@ -1,26 +1,26 @@
/**
-* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
-*
-* Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
-*
-* This program is free software; you can redistribute it and/or modify it under the
-* terms of the GNU Lesser General Public License as published by the Free Software
-* Foundation; either version 3.0 of the License, or (at your option) any later
-* version.
-*
-* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License along
-* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-*
-*/
+ * BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
+ *
+ * Copyright (c) 2016 BigBlueButton Inc. and by respective authors (see below).
+ *
+ * This program is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 3.0 of the License, or (at your option) any later
+ * version.
+ *
+ * BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+ *
+ */
package org.bigbluebutton.app.screenshare.server.sessions
-import akka.actor.{Actor, ActorLogging, Props}
+import akka.actor.{ Actor, ActorLogging, Props }
import org.bigbluebutton.app.screenshare.StreamInfo
-import org.bigbluebutton.app.screenshare.server.sessions.Session.{KeepAliveTimeout, SessionAuditMessage}
+import org.bigbluebutton.app.screenshare.server.sessions.Session.{ KeepAliveTimeout, SessionAuditMessage }
import org.bigbluebutton.app.screenshare.server.util.TimeUtil
import org.bigbluebutton.app.screenshare.server.sessions.messages._
import org.bigbluebutton.app.screenshare.events._
@@ -29,7 +29,7 @@ import scala.concurrent.duration._
object Session {
def props(parent: Screenshare, bus: IEventsMessageBus, meetingId: String, streamId: String, token: String,
- recorded: Boolean, userId: String): Props = Props(classOf[Session], parent, bus, meetingId,
+ recorded: Boolean, userId: String): Props = Props(classOf[Session], parent, bus, meetingId,
streamId, token, recorded, userId)
case object StartSession
@@ -38,17 +38,17 @@ object Session {
case class KeepAliveTimeout(streamId: String, stopSharing: Boolean)
}
-class Session(parent: Screenshare,
- bus: IEventsMessageBus,
- val meetingId: String,
- val streamId: String,
- val token: String,
- val recorded: Boolean,
- val userId: String) extends Actor with ActorLogging {
+class Session(
+ parent: Screenshare,
+ bus: IEventsMessageBus,
+ val meetingId: String,
+ val streamId: String,
+ val token: String,
+ val recorded: Boolean,
+ val userId: String) extends Actor with ActorLogging {
log.info("Creating of new Session streamId=[" + streamId + "]")
-
private var width: Option[Int] = None
private var height: Option[Int] = None
@@ -60,7 +60,7 @@ class Session(parent: Screenshare,
private val LAST_STATUS_UPDATE_TIMEOUT = 20
private var lastStatusUpdate = 0L
- private var sessionStartedTimestamp:Long = TimeUtil.currentMonoTimeInSeconds()
+ private var sessionStartedTimestamp: Long = TimeUtil.currentMonoTimeInSeconds()
private val SESSION_START_TIMEOUT = 60
// The last time we received a pong response from the client.
@@ -90,7 +90,7 @@ class Session(parent: Screenshare,
case msg: UserDisconnected => handleUserDisconnected(msg)
case msg: ScreenShareInfoRequest => handleScreenShareInfoRequest(msg)
case SessionAuditMessage => handleSessionAuditMessage()
- case msg: ClientPongMessage => handleClientPongMessage(msg)
+ case msg: ClientPongMessage => handleClientPongMessage(msg)
case m: Any => log.warning("Session: Unknown message [%s]", m)
}
@@ -144,7 +144,6 @@ class Session(parent: Screenshare,
bus.send(new ScreenShareStoppedEvent(meetingId, streamId, "NORMAL"))
}
-
private def handleSharingStartedMessage(msg: SharingStartedMessage) {
if (log.isDebugEnabled) {
log.debug("Received SharingStartedMessagefor streamId=[" + msg.streamId + "]")
diff --git a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/messages/IMessage.scala b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/messages/IMessage.scala
index 419c171b4d803c2cd33d07fc1e6022f3545c8251..3b4bc4b3d030b750ae613b87a99becd5f0ff2b04 100755
--- a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/messages/IMessage.scala
+++ b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/messages/IMessage.scala
@@ -34,8 +34,8 @@ case class UpdateShareStatus(meetingId: String, streamId: String, sequence: Int)
case class IsScreenSharing(meetingId: String, userId: String)
-case class IsScreenSharingReply(sharing: Boolean, streamId: String,
- width: Int, height: Int, url: String)
+case class IsScreenSharingReply(sharing: Boolean, streamId: String,
+ width: Int, height: Int, url: String)
case class ScreenShareInfoRequest(meetingId: String, token: String)
diff --git a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/util/LogHelper.scala b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/util/LogHelper.scala
index af5ec48cc3ebdf298e150df20c06df4fac99b149..dbe83dc52d9a768277f146622f565f816d6b2033 100755
--- a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/util/LogHelper.scala
+++ b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/util/LogHelper.scala
@@ -4,10 +4,10 @@ import org.slf4j.Logger
import org.red5.logging.Red5LoggerFactory
/**
- * LogHelper is a trait you can mix in to provide easy log4j logging
- * for your scala classes.
- **/
+ * LogHelper is a trait you can mix in to provide easy log4j logging
+ * for your scala classes.
+ */
trait LogHelper {
- val loggerName = this.getClass.getName
- lazy val logger = Red5LoggerFactory.getLogger(this.getClass, "screenshare")
+ val loggerName = this.getClass.getName
+ lazy val logger = Red5LoggerFactory.getLogger(this.getClass, "screenshare")
}
\ No newline at end of file
diff --git a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/util/RandomStringGenerator.scala b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/util/RandomStringGenerator.scala
index cef85f6a9722136249342f14b6ad8e5fef50fad9..e00d916cd77fc919da853596ffcb1d6f916858e7 100755
--- a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/util/RandomStringGenerator.scala
+++ b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/util/RandomStringGenerator.scala
@@ -1,17 +1,17 @@
package org.bigbluebutton.app.screenshare.server.util
object RandomStringGenerator {
-// From: http://www.bindschaedler.com/2012/04/07/elegant-random-string-generation-in-scala/
-
- // Random generator
- val random = new scala.util.Random
-
- // Generate a random string of length n from the given alphabet
- def randomString(alphabet: String)(n: Int): String =
- Stream.continually(random.nextInt(alphabet.size)).map(alphabet).take(n).mkString
-
- // Generate a random alphabnumeric string of length n
- def randomAlphanumericString(n: Int) =
- randomString("abcdefghijklmnopqrstuvwxyz0123456789")(n)
+ // From: http://www.bindschaedler.com/2012/04/07/elegant-random-string-generation-in-scala/
+
+ // Random generator
+ val random = new scala.util.Random
+
+ // Generate a random string of length n from the given alphabet
+ def randomString(alphabet: String)(n: Int): String =
+ Stream.continually(random.nextInt(alphabet.size)).map(alphabet).take(n).mkString
+
+ // Generate a random alphabnumeric string of length n
+ def randomAlphanumericString(n: Int) =
+ randomString("abcdefghijklmnopqrstuvwxyz0123456789")(n)
}
diff --git a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/util/TimeUtil.scala b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/util/TimeUtil.scala
index de8cfa2bd3db8e21e35b6fc9b1015dfda4a872a6..e22a4d9176ad5aec1d6bf3575d6a90894d7f4b51 100755
--- a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/util/TimeUtil.scala
+++ b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/util/TimeUtil.scala
@@ -4,11 +4,11 @@ import java.util.concurrent.TimeUnit
object TimeUtil {
- def generateTimestamp():Long = {
+ def generateTimestamp(): Long = {
TimeUnit.NANOSECONDS.toMillis(System.nanoTime())
}
-
- def getCurrentMonoTime():Long = {
+
+ def getCurrentMonoTime(): Long = {
TimeUnit.NANOSECONDS.toMillis(System.nanoTime())
}
@@ -20,7 +20,7 @@ object TimeUtil {
millisToSeconds(getCurrentMonoTime())
}
- def getCurrentTime():Long = {
+ def getCurrentTime(): Long = {
System.currentTimeMillis();
}
}
\ No newline at end of file
diff --git a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/store/redis/EventListenerImp.scala b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/store/redis/EventListenerImp.scala
index 3517942bbe23a365586f41c86ab230b3ecf67293..c530416254fecbb84b404e802bb6e70ae41abff4 100755
--- a/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/store/redis/EventListenerImp.scala
+++ b/bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/store/redis/EventListenerImp.scala
@@ -6,6 +6,6 @@ import org.bigbluebutton.app.screenshare.events.IEvent
class EventListenerImp extends IEventListener {
def handleMessage(event: IEvent) {
-
+
}
}
\ No newline at end of file
diff --git a/bbb-screenshare/app/src/main/webapp/WEB-INF/bbb-redis-pool.xml b/bbb-screenshare/app/src/main/webapp/WEB-INF/bbb-redis-pool.xml
index eae411543fed0d67cb1317a28759ec6add1cc36a..5aa3cc5f9aefa4a4b8af09abc545e26a898800db 100755
--- a/bbb-screenshare/app/src/main/webapp/WEB-INF/bbb-redis-pool.xml
+++ b/bbb-screenshare/app/src/main/webapp/WEB-INF/bbb-redis-pool.xml
@@ -27,9 +27,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
http://www.springframework.org/schema/util/spring-util-2.0.xsd
">
+<!--
<bean id="redisPool" class="redis.clients.jedis.JedisPool">
<constructor-arg index="0" value="${redis.host}"/>
<constructor-arg index="1" value="${redis.port}"/>
</bean>
-
+-->
</beans>
diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
index 35c30a062cc68467369290699e3c11b30196284f..f9fad493337fa1c87f9a35af9d2b579b4b33f06e 100755
--- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
+++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
@@ -153,7 +153,7 @@ class ApiController {
log.debug "Existing conference found"
Map<String, Object> updateParams = paramsProcessorUtil.processUpdateCreateParams(params);
if (existing.getViewerPassword().equals(params.get("attendeePW")) && existing.getModeratorPassword().equals(params.get("moderatorPW"))) {
- paramsProcessorUtil.updateMeeting(updateParams, existing);
+ //paramsProcessorUtil.updateMeeting(updateParams, existing);
// trying to create a conference a second time, return success, but give extra info
// Ignore pre-uploaded presentations. We only allow uploading of presentation once.
//uploadDocuments(existing);