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

- clean up logging

Browse Source
This commit is contained in:
Richard Alam 2018-01-31 08:38:54 -08:00
parent c4085c4482
commit 6485110a72
8 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bigbluebutton-client/src/org/bigbluebutton/core/services/BandwidthMonitor.as
View File

@ -109,7 +109,7 @@ package org.bigbluebutton.core.services
bwMonUrl = tunnelProtocol + "://" + result.server + "/" + bwMonOption.application;
trace("******* BW MON CONNECT tunnel = TRUE " + "url=" + bwMonUrl);
LOGGER.debug("BW MON CONNECT tunnel = TRUE " + "url=" + bwMonUrl);
} else {
var nativeProtocol: String = ConnUtil.RTMP;
if (useRTMPS) {
@ -118,7 +118,7 @@ package org.bigbluebutton.core.services
}
bwMonUrl = nativeProtocol + "://" + result.server + "/" + bwMonOption.application;
trace("******* BBB MON CONNECT tunnel = FALSE " + "url=" + bwMonUrl);
LOGGER.debug("BBB MON CONNECT tunnel = FALSE " + "url=" + bwMonUrl);
}
_nc.connect(bwMonUrl);

16
bigbluebutton-client/src/org/bigbluebutton/main/model/PortTest.as
View File

@ -134,14 +134,14 @@ package org.bigbluebutton.main.model
nc = new NetConnection();
nc.client = this;
trace("******** Connecting PORT TEST hostname= " + this.hostname);
LOGGER.debug("Connecting PORT TEST hostname= " + this.hostname);
var pattern:RegExp = /(?P<protocol>.+):\/\/(?P<server>.+)/;
var result:Array = pattern.exec(this.hostname);
var useRTMPS: Boolean = result.protocol == ConnUtil.RTMPS;
// Construct URI.
if (tunnel) {
trace("******** Connecting PORT TEST tunnel= " + tunnel);
LOGGER.debug("Connecting PORT TEST tunnel= " + tunnel);
var tunnelProtocol: String = ConnUtil.RTMPT;
if (useRTMPS) {
tunnelProtocol = ConnUtil.RTMPS;
@ -150,7 +150,7 @@ package org.bigbluebutton.main.model
this.baseURI = tunnelProtocol + "://" + result.server + "/" + this.application;
} else {
trace("******** Connecting PORT TEST tunnel= " + tunnel);
LOGGER.debug("Connecting PORT TEST tunnel= " + tunnel);
var nativeProtocol: String = ConnUtil.RTMP;
if (useRTMPS) {
nativeProtocol = ConnUtil.RTMPS;
@ -176,7 +176,7 @@ package org.bigbluebutton.main.model
var curTime:Number = new Date().getTime();
trace("******** Connecting PORT TEST = " + this.baseURI);
LOGGER.debug("Connecting PORT TEST = " + this.baseURI);
// Create connection with the server.
nc.connect( this.baseURI, "portTestMeetingId-" + curTime,
"portTestDummyUserId-" + curTime, "portTestDummyAuthToken");
@ -197,7 +197,7 @@ package org.bigbluebutton.main.model
logData.tags = ["initialization", "port-test", "connection"];
logData.message = "Port testing connection timedout.";
LOGGER.info(JSON.stringify(logData));
trace("******** Connect FAILED PORT TEST = " + this.baseURI);
LOGGER.debug("Connect FAILED PORT TEST = " + this.baseURI);
status = "FAILED";
_connectionListener(status, tunnel, hostname, port, application);
closeConnection();
@ -254,13 +254,13 @@ package org.bigbluebutton.main.model
logData.connection = this.baseURI;
logData.tags = ["initialization", "port-test", "connection"];
trace("******** Connect SUCCESS PORT TEST connected= " + nc.connected);
LOGGER.debug("Connect SUCCESS PORT TEST connected= " + nc.connected);
if ( statusCode == "NetConnection.Connect.Success" ) {
status = "SUCCESS";
logData.message = "Port test successfully connected.";
LOGGER.info(JSON.stringify(logData));
trace("******** Connect SUCCESS PORT TEST = " + this.baseURI);
LOGGER.debug("Connect SUCCESS PORT TEST = " + this.baseURI);
_connectionListener(status, tunnel, hostname, port, application);
} else if ( statusCode == "NetConnection.Connect.Rejected" ||
statusCode == "NetConnection.Connect.Failed" ||
@ -268,7 +268,7 @@ package org.bigbluebutton.main.model
logData.statusCode = statusCode;
logData.message = "Port test failed to connect.";
LOGGER.info(JSON.stringify(logData));
trace("******** Connect FAILED (2) PORT TEST = " + this.baseURI);
LOGGER.debug("Connect FAILED (2) PORT TEST = " + this.baseURI);
status = "FAILED";
_connectionListener(status, tunnel, hostname, port, application);

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

@ -219,8 +219,6 @@ package org.bigbluebutton.main.model.users
var message: ValidateAuthTokenReqMsg = new ValidateAuthTokenReqMsg(body);
LOGGER.debug("******* msg \n" + JSON.stringify(message));
sendMessage2x(
// result - On successful result
function(result:Object):void {
@ -417,7 +415,7 @@ package org.bigbluebutton.main.model.users
}
bbbAppsUrl = tunnelProtocol + "://" + result.server + "/" + result.app + "/" + intMeetingId;
trace("******* BBB APPS CONNECT tunnel = TRUE " + "url=" + bbbAppsUrl);
LOGGER.debug("BBB APPS CONNECT tunnel = TRUE " + "url=" + bbbAppsUrl);
} else {
var nativeProtocol: String = ConnUtil.RTMP;
if (useRTMPS) {
@ -426,7 +424,7 @@ package org.bigbluebutton.main.model.users
}
bbbAppsUrl = nativeProtocol + "://" + result.server + "/" + result.app + "/" + intMeetingId;
trace("******* BBB APPS CONNECT tunnel = FALSE " + "url=" + bbbAppsUrl);
LOGGER.debug("BBB APPS CONNECT tunnel = FALSE " + "url=" + bbbAppsUrl);
}

6
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
View File

@ -104,7 +104,7 @@ package org.bigbluebutton.modules.phone.managers {
}
uri = tunnelProtocol + "://" + result.server + "/" + result.app;
trace("******* BBB SIP CONNECT tunnel = TRUE " + "url=" + uri);
LOGGER.debug("BBB SIP CONNECT tunnel = TRUE " + "url=" + uri);
} else {
var nativeProtocol: String = ConnUtil.RTMP;
if (useRTMPS) {
@ -113,10 +113,10 @@ package org.bigbluebutton.modules.phone.managers {
}
uri = nativeProtocol + "://" + result.server + "/" + result.app;
trace("******* BBB SIP CONNECT tunnel = FALSE " + "url=" + uri);
LOGGER.debug("BBB SIP CONNECT tunnel = FALSE " + "url=" + uri);
}
LOGGER.debug("******** VOICE CONF == Connecting to uri=[{0}]", [uri]);
LOGGER.debug("VOICE CONF == Connecting to uri=[{0}]", [uri]);
netConnection.objectEncoding = ObjectEncoding.AMF3;

4
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/red5/Connection.as
View File

@ -72,7 +72,7 @@ package org.bigbluebutton.modules.screenshare.services.red5 {
}
ssAppUrl = tunnelProtocol + "://" + result.server + "/" + result.app + "/" + UsersUtil.getInternalMeetingID();
trace("******* SCREENSHARE CONNECT tunnel = TRUE " + "url=" + ssAppUrl);
LOGGER.debug("SCREENSHARE CONNECT tunnel = TRUE " + "url=" + ssAppUrl);
} else {
var nativeProtocol: String = ConnUtil.RTMP;
if (useRTMPS) {
@ -81,7 +81,7 @@ package org.bigbluebutton.modules.screenshare.services.red5 {
}
ssAppUrl = nativeProtocol + "://" + result.server + "/" + result.app + "/" + UsersUtil.getInternalMeetingID();
trace("******* SCREENSHARE CONNECT tunnel = FALSE " + "url=" + ssAppUrl);
LOGGER.debug("SCREENSHARE CONNECT tunnel = FALSE " + "url=" + ssAppUrl);
}
netConnection.client = this;

8
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/WebRTCDesktopPublishWindow.mxml
View File

@ -259,7 +259,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
ssAppUrl = tunnelProtocol + "://" + result.serverAndApp;
trace("******* WEBRTC SSHARE CONNECT tunnel = TRUE " + "url=" + ssAppUrl);
LOGGER.debug("WEBRTC SSHARE CONNECT tunnel = TRUE " + "url=" + ssAppUrl);
} else {
var nativeProtocol: String = ConnUtil.RTMP;
if (useRTMPS) {
@ -268,7 +268,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
ssAppUrl = nativeProtocol + "://" + result.serverAndApp;
trace("******* WEBRTC SSHARE CONNECT tunnel = FALSE " + "url=" + ssAppUrl);
LOGGER.debug("WEBRTC SSHARE CONNECT tunnel = FALSE " + "url=" + ssAppUrl);
}
connection.objectEncoding = ObjectEncoding.AMF3;
@ -298,7 +298,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
break;
case "NetConnection.Connect.Closed":
trace("Deskshare connection closed.");
LOGGER.debug("Deskshare connection closed.");
ce.status = WebRTCConnectionEvent.CLOSED;
break;
@ -311,7 +311,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
break;
case "NetConnection.Connect.NetworkChange":
trace("Detected network change. User might be on a wireless and " +
LOGGER.debug("Detected network change. User might be on a wireless and " +
"temporarily dropped connection. Doing nothing. Just making a note.");
break;
}

9
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/WebRTCDesktopViewWindow.mxml
View File

@ -40,16 +40,13 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<fx:Script>
<![CDATA[
import mx.core.UIComponent;
import flexlib.mdi.events.MDIWindowEvent;
import org.as3commons.logging.api.ILogger;
import org.as3commons.logging.api.getClassLogger;
import org.bigbluebutton.common.IBbbModuleWindow;
import org.bigbluebutton.common.events.LocaleChangeEvent;
import org.bigbluebutton.core.BBB;
import org.bigbluebutton.core.Options;
import org.bigbluebutton.core.UsersUtil;
import org.bigbluebutton.main.views.MainCanvas;
import org.bigbluebutton.modules.screenshare.events.ViewStreamEvent;
import org.bigbluebutton.modules.screenshare.events.ViewWindowEvent;
@ -150,7 +147,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
ssAppUrl = tunnelProtocol + "://" + result.serverAndApp;
trace("******* WEBRTC SSHARE CONNECT tunnel = TRUE " + "url=" + ssAppUrl);
LOGGER.debug("WEBRTC SSHARE CONNECT tunnel = TRUE " + "url=" + ssAppUrl);
} else {
var nativeProtocol: String = ConnUtil.RTMP;
if (useRTMPS) {
@ -159,7 +156,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
ssAppUrl = nativeProtocol + "://" + result.serverAndApp;
trace("******* WEBRTC SSHARE CONNECT tunnel = FALSE " + "url=" + ssAppUrl);
LOGGER.debug("WEBRTC SSHARE CONNECT tunnel = FALSE " + "url=" + ssAppUrl);
}
nc.objectEncoding = ObjectEncoding.AMF3;
@ -224,7 +221,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
break;
case "NetConnection.Connect.NetworkChange":
trace(LOG + "Detected network change. User might be on a wireless and temporarily dropped connection. Doing nothing. Just making a note.");
LOGGER.debug(LOG + "Detected network change. User might be on a wireless and temporarily dropped connection. Doing nothing. Just making a note.");
break;
}
}

4
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
View File

@ -96,7 +96,7 @@ package org.bigbluebutton.modules.videoconf.business
}
videoConnUrl = tunnelProtocol + "://" + result.server + "/" + result.app;
trace("******* VIDEO CONNECT tunnel = TRUE " + "url=" + videoConnUrl);
LOGGER.debug("VIDEO CONNECT tunnel = TRUE " + "url=" + videoConnUrl);
} else {
var nativeProtocol: String = ConnUtil.RTMP;
if (useRTMPS) {
@ -105,7 +105,7 @@ package org.bigbluebutton.modules.videoconf.business
}
videoConnUrl = nativeProtocol + "://" + result.server + "/" + result.app;
trace("******* VIDEO CONNECT tunnel = FALSE " + "url=" + videoConnUrl);
LOGGER.debug("VIDEO CONNECT tunnel = FALSE " + "url=" + videoConnUrl);
}
videoConnUrl = videoConnUrl + "/" + UsersUtil.getInternalMeetingID();