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

Merge pull request #748 from ritzalam/remove-some-printlns

Browse Source 
- remove some printlns to lessen noise
This commit is contained in:
Richard Alam 2015-08-07 17:42:30 -04:00
commit 1efea72d09
9 changed files with 12 additions and 1802 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,7 +126,7 @@ public class UsersMessageReceiver implements MessageHandler{
}
}
} else if (channel.equalsIgnoreCase(MessagingConstants.FROM_VOICE_CONF_SYSTEM_CHAN)) {
System.out.println("Voice message: " + channel + " " + message);
//System.out.println("Voice message: " + channel + " " + message);
JsonParser parser = new JsonParser();
JsonObject obj = (JsonObject) parser.parse(message);
if (obj.has("header") && obj.has("payload")) {

7
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
View File

@ -228,13 +228,6 @@ class BigBlueButtonActor(val system: ActorSystem, recorderApp: RecorderApplicati
var info = new MeetingInfo(id, name, recorded, voiceBridge, duration)
resultArray(i) = info
//remove later
println("for a meeting:" + id)
println("Meeting Name = " + meetings.get(id).head.mProps.meetingName)
println("isRecorded = " + meetings.get(id).head.mProps.recorded)
println("voiceBridge = " + voiceBridge)
println("duration = " + duration)
//send the users
self ! (new GetUsers(id, "nodeJSapp"))

1760
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
View File

File diff suppressed because it is too large Load Diff

22
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/CollectorGateway.scala
View File

@ -1,22 +0,0 @@
package org.bigbluebutton.core
import org.bigbluebutton.core.api.IDispatcher
import org.bigbluebutton.core.api.InMessage
import org.bigbluebutton.core.api.IOutMessage
import org.bigbluebutton.core.api.OutMessageListener2
class CollectorGateway(dispatcher: IDispatcher) extends OutMessageListener2 {
// FIXME
// private val collActor = new CollectorActor(dispatcher)
// collActor.start
def collectInMessage(msg: InMessage) {
// collActor ! msg
}
def handleMessage(msg: IOutMessage) {
// collActor ! msg
}
}

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

@ -31,7 +31,7 @@ class MeetingActor(val mProps: MeetingProperties, val outGW: OutMessageGateway)
val presModel = new PresentationModel()
import context.dispatcher
context.system.scheduler.schedule(2 seconds, 5 seconds, self, "MonitorNumberOfWebUsers")
context.system.scheduler.schedule(2 seconds, 30 seconds, self, "MonitorNumberOfWebUsers")
outGW.send(new GetUsersInVoiceConference(mProps.meetingID, mProps.recorded, mProps.voiceBridge))
@ -223,7 +223,7 @@ class MeetingActor(val mProps: MeetingProperties, val outGW: OutMessageGateway)
}
def handleMonitorNumberOfWebUsers() {
println("BACK TIMER")
// println("BACK TIMER")
if (usersModel.numWebUsers == 0 && meetingModel.lastWebUserLeftOn > 0) {
if (timeNowInMinutes - meetingModel.lastWebUserLeftOn > 2) {
log.info("MonitorNumberOfWebUsers empty for meeting [" + mProps.meetingID + "]. Ejecting all users from voice.")
@ -233,7 +233,7 @@ class MeetingActor(val mProps: MeetingProperties, val outGW: OutMessageGateway)
val now = timeNowInMinutes
println("(" + meetingModel.startedOn + "+" + mProps.duration + ") - " + now + " = " + ((meetingModel.startedOn + mProps.duration) - now) + " < 15")
// println("(" + meetingModel.startedOn + "+" + mProps.duration + ") - " + now + " = " + ((meetingModel.startedOn + mProps.duration) - now) + " < 15")
if (mProps.duration > 0 && (((meetingModel.startedOn + mProps.duration) - now) < 15)) {
log.warning("MEETING WILL END IN 15 MINUTES!!!!")

6
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
View File

@ -572,13 +572,13 @@ class MessageSenderActor(val meetingId: String, val service: MessageSender)
private def handleValidateAuthTokenReply(msg: ValidateAuthTokenReply) {
val json = UsersMessageToJsonConverter.validateAuthTokenReplyToJson(msg)
println("************** Publishing [" + json + "] *******************")
//println("************** Publishing [" + json + "] *******************")
service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
}
private def handleValidateAuthTokenTimedOut(msg: ValidateAuthTokenTimedOut) {
val json = UsersMessageToJsonConverter.validateAuthTokenTimeoutToJson(msg)
println("************** Publishing [" + json + "] *******************")
//println("************** Publishing [" + json + "] *******************")
service.send(MessagingConstants.FROM_USERS_CHANNEL, json)
}
@ -641,4 +641,4 @@ class MessageSenderActor(val meetingId: String, val service: MessageSender)
val json = WhiteboardMessageToJsonConverter.isWhiteboardEnabledReplyToJson(msg)
service.send(MessagingConstants.FROM_WHITEBOARD_CHANNEL, json)
}
}
}

6
akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisPublisher.scala
View File

@ -14,9 +14,9 @@ class RedisPublisher(val system: ActorSystem) extends SystemConfiguration {
val redis = RedisClient(redisHost, redisPort)(system)
val futurePong = redis.ping()
println("Ping sent!")
// println("Ping sent!")
futurePong.map(pong => {
println(s"Redis replied with a $pong")
// println(s"Redis replied with a $pong")
})
Await.result(futurePong, 5 seconds)
@ -26,7 +26,7 @@ class RedisPublisher(val system: ActorSystem) extends SystemConfiguration {
// system.scheduler.schedule(2 seconds, 5 seconds)(redis.publish("bigbluebutton:to-bbb-apps:users", "pattern value"))
def publish(channel: String, data: String) {
println("PUBLISH TO [" + channel + "]: \n [" + data + "]")
// println("PUBLISH TO [" + channel + "]: \n [" + data + "]")
redis.publish(channel, data)
}

4
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as Normal file → Executable file
View File

@ -108,7 +108,7 @@ package org.bigbluebutton.modules.videoconf.business
logData.user = UsersUtil.getUserData();
logData.user.eventCode = event.info.code + "[reconnecting=" + reconnecting + ",reconnect=" + reconnect + "]";
JSLog.warn("NetStatus event from bbb-video", logData);
// JSLog.warn("NetStatus event from bbb-video", logData);
switch(event.info.code){
case "NetConnection.Connect.Success":
@ -154,7 +154,7 @@ package org.bigbluebutton.modules.videoconf.business
disconnect();
break;
case "NetConnection.Connect.NetworkChange":
JSLog.warn("Detected network change on bbb-video", logData);
// JSLog.warn("Detected network change on bbb-video", logData);
break;
default:
LOGGER.debug("[{0}] for [{1}]", [event.info.code, _url]);

1
bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java
View File

@ -25,7 +25,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.apache.commons.lang.RandomStringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;