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

Breakout related requests are sent to the correct "meeting" redis channel.

Browse Source
This commit is contained in:
Ghazi Triki 2015-11-17 18:34:13 -02:00
parent 16d521c338
commit 69acc57f2d
2 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java
View File

@ -37,35 +37,39 @@ public class MeetingMessageReceiver implements MessageHandler {
}
public void handleMessage(String pattern, String channel, String message) {
// LOG.debug("Checking message: " + pattern + " " + channel + " " + message);
if (channel.equalsIgnoreCase(MessagingConstants.TO_MEETING_CHANNEL)) {
// System.out.println("Meeting message: " + channel + " " + message);
JsonParser parser = new JsonParser();
JsonObject obj = (JsonObject) parser.parse(message);
if (obj.has("header") && obj.has("payload")) {
JsonObject header = (JsonObject) obj.get("header");
if (header.has("name")) {
String messageName = header.get("name").getAsString();
if (CreateMeetingRequest.NAME.equals(messageName)) {
Gson gson = new Gson();
CreateMeetingRequest msg = gson.fromJson(message, CreateMeetingRequest.class);
bbbGW.handleBigBlueButtonMessage(msg);
} else if (CreateBreakoutRoomsRequest.NAME.equals(messageName)) {
Gson gson = new Gson();
CreateBreakoutRoomsRequest msg = gson.fromJson(message, CreateBreakoutRoomsRequest.class);
bbbGW.handleBigBlueButtonMessage(msg);
} else if (ListenInOnBreakout.NAME.equals(messageName)) {
Gson gson = new Gson();
ListenInOnBreakout msg = gson.fromJson(message, ListenInOnBreakout.class);
bbbGW.handleBigBlueButtonMessage(msg);
} else if (RequestBreakoutJoinURL.NAME.equals(messageName)) {
Gson gson = new Gson();
RequestBreakoutJoinURL msg = gson.fromJson(message, RequestBreakoutJoinURL.class);
bbbGW.handleBigBlueButtonMessage(msg);
}
}
}
System.out.println("Meeting message: " + channel + " " + message);
JsonParser parser = new JsonParser();
JsonObject obj = (JsonObject) parser.parse(message);
if (obj.has("header") && obj.has("payload")) {
JsonObject header = (JsonObject) obj.get("header");
if (header.has("name")) {
String messageName = header.get("name").getAsString();
if (CreateMeetingRequest.NAME.equals(messageName)) {
Gson gson = new Gson();
CreateMeetingRequest msg = gson.fromJson(message,
CreateMeetingRequest.class);
bbbGW.handleBigBlueButtonMessage(msg);
} else if (CreateBreakoutRoomsRequest.NAME
.equals(messageName)) {
Gson gson = new Gson();
CreateBreakoutRoomsRequest msg = gson.fromJson(message,
CreateBreakoutRoomsRequest.class);
bbbGW.handleBigBlueButtonMessage(msg);
} else if (ListenInOnBreakout.NAME.equals(messageName)) {
Gson gson = new Gson();
ListenInOnBreakout msg = gson.fromJson(message,
ListenInOnBreakout.class);
bbbGW.handleBigBlueButtonMessage(msg);
} else if (RequestBreakoutJoinURL.NAME.equals(messageName)) {
Gson gson = new Gson();
RequestBreakoutJoinURL msg = gson.fromJson(message,
RequestBreakoutJoinURL.class);
bbbGW.handleBigBlueButtonMessage(msg);
}
}
}
IBigBlueButtonMessage msg = MessageFromJsonConverter.convert(message);

8
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
View File

@ -280,21 +280,21 @@ public class MessagePublisher {
public void createBreakoutRooms(CreateBreakoutRoomsRequestPayload payload) {
CreateBreakoutRoomsRequest msg = new CreateBreakoutRoomsRequest(payload);
sender.send(MessagingConstants.TO_USERS_CHANNEL, msg.toJson());
sender.send(MessagingConstants.TO_MEETING_CHANNEL, msg.toJson());
}
public void requestBreakoutJoinURL(RequestBreakoutJoinURLPayload payload) {
RequestBreakoutJoinURL msg = new RequestBreakoutJoinURL(payload);
sender.send(MessagingConstants.TO_USERS_CHANNEL, msg.toJson());
sender.send(MessagingConstants.TO_MEETING_CHANNEL, msg.toJson());
}
public void listenInOnBreakout(ListenInOnBreakoutPayload payload) {
ListenInOnBreakout msg = new ListenInOnBreakout(payload);
sender.send(MessagingConstants.TO_USERS_CHANNEL, msg.toJson());
sender.send(MessagingConstants.TO_MEETING_CHANNEL, msg.toJson());
}
public void endAllBreakoutRooms(EndAllBreakoutRoomsRequestPayload payload){
EndAllBreakoutRoomsRequest msg = new EndAllBreakoutRoomsRequest(payload);
sender.send(MessagingConstants.TO_USERS_CHANNEL, msg.toJson());
sender.send(MessagingConstants.TO_MEETING_CHANNEL, msg.toJson());
}
}