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 2d28f3f86f09a1c8260db8e444bca02c29640492..b048a4a774f1cbb0533f70a4d65dddf8f05fcb91 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 52d8b3aa1be602f55c8b33ffb3d43f27948ac84e..e61cd473a92ef387fddd52e0b6248efdcd25ee36 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 49f9263bf3654b7f4529d0fe12e8d8b2a6da1c52..9b9571fb5bb3e0a28de0290ca8f2ee2731a509b6 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();