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

Merge pull request #4193 from ritzalam/route-end-meeting-message

Browse Source 
Route end meeting message
This commit is contained in:
Richard Alam 2017-08-02 16:26:42 -04:00 committed by GitHub
commit d6f5e13074
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
View File

@ -216,6 +216,8 @@ class ReceivedJsonMsgHandlerActor(
routeGenericMsg[ClearPublicChatHistoryPubMsg](envelope, jsonNode)
// Meeting
case EndMeetingSysCmdMsg.NAME =>
routeGenericMsg[EndMeetingSysCmdMsg](envelope, jsonNode)
case MeetingActivityResponseCmdMsg.NAME =>
routeGenericMsg[MeetingActivityResponseCmdMsg](envelope, jsonNode)
case LogoutAndEndMeetingCmdMsg.NAME =>

2
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
View File

@ -173,6 +173,8 @@ class MeetingActor(
state = state.update(tracker)
msg.core match {
case m: EndMeetingSysCmdMsg => handleEndMeeting(m)
// Users
case m: ValidateAuthTokenReqMsg =>
state = usersApp.handleValidateAuthTokenReqMsg(m, state)

4
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/SystemMsgs.scala
View File

@ -23,8 +23,8 @@ case class DestroyMeetingSysCmdMsgBody(meetingId: String)
* Sent by bbb-web
*/
object EndMeetingSysCmdMsg { val NAME = "EndMeetingSysCmdMsg" }
case class EndMeetingSysCmdMsg(header: BbbCoreBaseHeader,
body: EndMeetingSysCmdMsgBody) extends BbbCoreMsg
case class EndMeetingSysCmdMsg(header: BbbClientMsgHeader,
body: EndMeetingSysCmdMsgBody) extends StandardMsg
case class EndMeetingSysCmdMsgBody(meetingId: String)

2
bbb-common-web/src/main/scala/org/bigbluebutton/api2/MsgBuilder.scala
View File

@ -20,7 +20,7 @@ object MsgBuilder {
def buildEndMeetingSysCmdMsg(msg: EndMeetingMessage): BbbCommonEnvCoreMsg = {
val routing = collection.immutable.HashMap("sender" -> "bbb-web")
val envelope = BbbCoreEnvelope(EndMeetingSysCmdMsg.NAME, routing)
val header = BbbCoreBaseHeader(EndMeetingSysCmdMsg.NAME)
val header = BbbClientMsgHeader(EndMeetingSysCmdMsg.NAME, msg.meetingId, "not-used")
val body = EndMeetingSysCmdMsgBody(msg.meetingId)
val req = EndMeetingSysCmdMsg(header, body)
BbbCommonEnvCoreMsg(envelope, req)

6
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
View File

@ -158,7 +158,7 @@ package org.bigbluebutton.main.model.users
public function onMessageFromServer2x(messageName:String, msg:String):void {
if (messageName != "SendCursorPositionEvtMsg") {
LOGGER.info("onMessageFromServer2x - " + msg);
LOGGER.debug("onMessageFromServer2x - " + msg);
}
var map:Object = JSON.parse(msg);
@ -178,10 +178,6 @@ package org.bigbluebutton.main.model.users
} else {
LOGGER.debug("Ignoring message=[{0}] as our token hasn't been validated yet.", [messageName]);
}
//var tokenValid: Boolean = body.valid as Boolean;
//var userId: String = body.userId as String;
//trace("onMessageFromServer - " + tokenValid);
}
public function onMessageFromServer(messageName:String, msg:Object):void {