From 4aedea9f5a87cc3d4e14da92ebc6d7789f1ec84b Mon Sep 17 00:00:00 2001
From: Richard Alam <ritzalam@gmail.com>
Date: Tue, 23 May 2017 17:02:40 -0700
Subject: [PATCH] - try new messages
---
.../bigbluebutton/web/services/KeepAliveService.java | 4 ++--
.../bigbluebutton/red5/BigBlueButtonApplication.java | 10 +++++++---
.../main/model/users/NetConnectionDelegate.as | 4 ++--
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/web/services/KeepAliveService.java b/bbb-common-web/src/main/java/org/bigbluebutton/web/services/KeepAliveService.java
index 2d28f3f86f..b048a4a774 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/web/services/KeepAliveService.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/web/services/KeepAliveService.java
@@ -115,9 +115,9 @@ public class KeepAliveService implements MessageListener {
Runnable task = new Runnable() {
public void run() {
if (msg instanceof KeepAlivePing) {
- processPing((KeepAlivePing) msg);
+// processPing((KeepAlivePing) msg);
} else if (msg instanceof KeepAlivePong) {
- processPong((KeepAlivePong) msg);
+// processPong((KeepAlivePong) msg);
}
}
};
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java
index 52d8b3aa1b..e61cd473a9 100755
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java
+++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java
@@ -244,7 +244,7 @@ public class BigBlueButtonApplication extends MultiThreadedApplicationAdapter {
String logStr = gson.toJson(logData);
// log.info("User joining bbb-apps: data={}", logStr);
-
+ System.out.println("User joining bbb-apps: data=" + logStr);
userConnections.addUserConnection(userId, connId);
ConnInfo connInfo = getConnInfo();
@@ -301,7 +301,8 @@ public class BigBlueButtonApplication extends MultiThreadedApplicationAdapter {
boolean removeUser = userConnections.userDisconnected(userId, connId);
if (removeUser) {
-// log.info("User leaving bbb-apps: data={}", logStr);
+ // log.info("User leaving bbb-apps: data={}", logStr);
+ System.out.println("User leaving bbb-apps: data=" + logStr);
red5InGW.userLeft(bbbSession.getRoom(), getBbbSession().getInternalUserID(), sessionId);
} else {
log.info("User not leaving bbb-apps but just disconnected: data={}", logStr);
@@ -314,6 +315,7 @@ public class BigBlueButtonApplication extends MultiThreadedApplicationAdapter {
}
public void onMessageFromClient(String json) {
+ System.out.println("onMessageFromClient \n" + json);
ConnInfo connInfo = getConnInfo();
clientInGW.handleMsgFromClient(connInfo, json);
}
@@ -351,7 +353,9 @@ public class BigBlueButtonApplication extends MultiThreadedApplicationAdapter {
Gson gson = new Gson();
String logStr = gson.toJson(logData);
- // log.info("User validate token bbb-apps: data={}", logStr);
+ log.info("User validate token bbb-apps: data={}", logStr);
+ System.out.println("User validate token bbb-apps: data=" + logStr);
+ System.out.println("User validate token bbb-apps: data=" + logStr);
red5InGW.validateAuthToken(meetingId, userId, token, meetingId + "/" + userId, sessionId);
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
index 49f9263bf3..9b9571fb5b 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
@@ -125,7 +125,7 @@ package org.bigbluebutton.main.model.users
LOGGER.info(JSON.stringify(logData));
}
- private function validateToken1():void {
+ private function validateToken():void {
var confParams:ConferenceParameters = BBB.initUserConfigManager().getConfParams();
var header:Object = new Object();
@@ -164,7 +164,7 @@ package org.bigbluebutton.main.model.users
_validateTokenTimer.start();
}
- private function validateToken():void {
+ private function validateToken1():void {
var confParams:ConferenceParameters = BBB.initUserConfigManager().getConfParams();
var header:Object = new Object();
--
GitLab