From 7956b561d237cdee2ce24616b50bb2322f3585bb Mon Sep 17 00:00:00 2001
From: Richard Alam <ritzalam@gmail.com>
Date: Fri, 11 Aug 2017 11:22:26 -0700
Subject: [PATCH] - remove some printlns to minimize noise
---
.../receivers/MeetingMessageReceiver.java | 1 -
.../FreeswitchConferenceEventListener.java | 11 +-------
.../voice/freeswitch/ConnectionManager.java | 4 ---
.../voice/freeswitch/ESLEventListener.java | 26 ++-----------------
.../freeswitch/FreeswitchApplication.java | 6 -----
.../ScreenshareBroadcastRTMPCommand.java | 1 -
.../actions/ScreenshareHangUpCommand.java | 1 -
.../actions/ScreenshareRecordCommand.java | 2 --
.../endpoint/redis/RedisPublisher.scala | 2 +-
.../freeswitch/VoiceConferenceService.scala | 9 -------
.../client/ClientGWApplication.scala | 1 -
.../api/ParamsProcessorUtil.java | 4 ---
.../PresentationUrlDownloadService.java | 2 --
.../bigbluebutton/api2/BbbWebApiGWApp.scala | 9 -------
.../api2/bus/ReceivedJsonMsgHdlrActor.scala | 7 ++---
.../api2/endpoint/redis/RedisPublisher.scala | 2 +-
.../messaging/ConnectionInvokerService.java | 2 --
17 files changed, 7 insertions(+), 83 deletions(-)
diff --git a/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java b/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java
index 9325969418..8552ecf11a 100755
--- a/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java
+++ b/akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java
@@ -33,7 +33,6 @@ public class MeetingMessageReceiver implements MessageHandler {
public void handleMessage(String pattern, String channel, String 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);
diff --git a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/FreeswitchConferenceEventListener.java b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/FreeswitchConferenceEventListener.java
index ba06e84dee..6bdb81c4a4 100755
--- a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/FreeswitchConferenceEventListener.java
+++ b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/FreeswitchConferenceEventListener.java
@@ -61,43 +61,34 @@ public class FreeswitchConferenceEventListener implements ConferenceEventListene
Runnable task = new Runnable() {
public void run() {
if (event instanceof VoiceUserJoinedEvent) {
- System.out.println("************** FreeswitchConferenceEventListener received voiceUserJoined ");
VoiceUserJoinedEvent evt = (VoiceUserJoinedEvent) event;
vcs.userJoinedVoiceConf(evt.getRoom(), evt.getVoiceUserId(), evt.getUserId(), evt.getCallerIdName(),
evt.getCallerIdNum(), evt.getMuted(), evt.getSpeaking(), evt.getAvatarURL());
} else if (event instanceof VoiceUserLeftEvent) {
- System.out.println("************** FreeswitchConferenceEventListener received VoiceUserLeftEvent ");
VoiceUserLeftEvent evt = (VoiceUserLeftEvent) event;
vcs.userLeftVoiceConf(evt.getRoom(), evt.getUserId());
} else if (event instanceof VoiceUserMutedEvent) {
- System.out.println("************** FreeswitchConferenceEventListener VoiceUserMutedEvent ");
VoiceUserMutedEvent evt = (VoiceUserMutedEvent) event;
vcs.userMutedInVoiceConf(evt.getRoom(), evt.getUserId(), evt.isMuted());
} else if (event instanceof VoiceUserTalkingEvent) {
- System.out.println("************** FreeswitchConferenceEventListener VoiceUserTalkingEvent ");
VoiceUserTalkingEvent evt = (VoiceUserTalkingEvent) event;
vcs.userTalkingInVoiceConf(evt.getRoom(), evt.getUserId(), evt.isTalking());
} else if (event instanceof VoiceStartRecordingEvent) {
VoiceStartRecordingEvent evt = (VoiceStartRecordingEvent) event;
- System.out.println("************** FreeswitchConferenceEventListener VoiceStartRecordingEvent recording=[" + evt.startRecord() + "]");
vcs.voiceConfRecordingStarted(evt.getRoom(), evt.getRecordingFilename(), evt.startRecord(), evt.getTimestamp());
} else if (event instanceof ScreenshareStartedEvent) {
ScreenshareStartedEvent evt = (ScreenshareStartedEvent) event;
- System.out.println("************** FreeswitchConferenceEventListener ScreenshareStartedEvent");
vcs.deskShareStarted(evt.getRoom(), evt.getCallerIdNum(), evt.getCallerIdName());
} else if (event instanceof DeskShareEndedEvent) {
DeskShareEndedEvent evt = (DeskShareEndedEvent) event;
- System.out.println("************** FreeswitchConferenceEventListener DeskShareEndedEvent");
vcs.deskShareEnded(evt.getRoom(), evt.getCallerIdNum(), evt.getCallerIdName());
} else if (event instanceof ScreenshareRTMPBroadcastEvent) {
if (((ScreenshareRTMPBroadcastEvent) event).getBroadcast()) {
ScreenshareRTMPBroadcastEvent evt = (ScreenshareRTMPBroadcastEvent) event;
- System.out.println("************** FreeswitchConferenceEventListener DeskShareRTMPBroadcastStartedEvent");
vcs.deskShareRTMPBroadcastStarted(evt.getRoom(), evt.getBroadcastingStreamUrl(),
evt.getVideoWidth(), evt.getVideoHeight(), evt.getTimestamp());
} else {
- ScreenshareRTMPBroadcastEvent evt = (ScreenshareRTMPBroadcastEvent) event;
- System.out.println("************** FreeswitchConferenceEventListener DeskShareRTMPBroadcastStoppedEvent");
+ ScreenshareRTMPBroadcastEvent evt = (ScreenshareRTMPBroadcastEvent) event;
vcs.deskShareRTMPBroadcastStopped(evt.getRoom(), evt.getBroadcastingStreamUrl(),
evt.getVideoWidth(), evt.getVideoHeight(), evt.getTimestamp());
}
diff --git a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
index 29c1a3bbe5..c0e2b53b7c 100755
--- a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
+++ b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
@@ -120,10 +120,8 @@ public class ConnectionManager {
}
public void mute(MuteUserCommand mpc) {
- System.out.println("Got mute request from FSApplication.");
Client c = manager.getESLClient();
if (c.canSend()) {
- System.out.println("Issuing command to FS ESL.");
c.sendAsyncApiCommand(mpc.getCommand(), mpc.getCommandArgs());
}
}
@@ -161,7 +159,6 @@ public class ConnectionManager {
public void broadcastRTMP(ScreenshareBroadcastRTMPCommand rtmp) {
Client c = manager.getESLClient();
if (c.canSend()) {
- System.out.println("ConnectionManager: send to FS: broadcastRTMP " + rtmp.getCommandArgs());
EslMessage response = c.sendSyncApiCommand(rtmp.getCommand(), rtmp.getCommandArgs());
rtmp.handleResponse(response, conferenceEventListener);
}
@@ -170,7 +167,6 @@ public class ConnectionManager {
public void hangUp(ScreenshareHangUpCommand huCmd) {
Client c = manager.getESLClient();
if (c.canSend()) {
- System.out.println("ConnectionManager: send to FS: hangUp " + huCmd.getCommandArgs());
EslMessage response = c.sendSyncApiCommand(huCmd.getCommand(), huCmd.getCommandArgs());
huCmd.handleResponse(response, conferenceEventListener);
}
diff --git a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
index a5cce61c77..cc2685db5a 100755
--- a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
+++ b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
@@ -34,7 +34,7 @@ public class ESLEventListener implements IEslEventListener {
@Override
public void backgroundJobResultReceived(EslEvent event) {
- System.out.println( "Background job result received [" + event + "]");
+ //System.out.println( "Background job result received [" + event + "]");
}
@Override
@@ -60,15 +60,13 @@ public class ESLEventListener implements IEslEventListener {
Matcher gapMatcher = GLOBAL_AUDION_PATTERN.matcher(callerIdName);
if (gapMatcher.matches()) {
- System.out.println("Ignoring GLOBAL AUDIO USER [" + callerIdName + "]");
+ //System.out.println("Ignoring GLOBAL AUDIO USER [" + callerIdName + "]");
return;
}
// (WebRTC) Deskstop sharing conferences' name is of the form ddddd-SCREENSHARE
// Voice conferences' name is of the form ddddd
if (confName.endsWith(SCREENSHARE_CONFERENCE_NAME_SUFFIX)) {
- System.out.println("User joined deskshare conference, user=[" + callerIdName + "], " +
- "conf=[" + confName + "] callerId=[" + callerId + "]");
ScreenshareStartedEvent dsStart = new ScreenshareStartedEvent(confName, callerId, callerIdName);
conferenceEventListener.handleConferenceEvent(dsStart);
} else {
@@ -78,8 +76,6 @@ public class ESLEventListener implements IEslEventListener {
callerIdName = matcher.group(2).trim();
}
- System.out.println("User joined voice conference, user=[" + callerIdName + "], conf=[" +
- confName + "] callerId=[" + callerId + "]");
VoiceUserJoinedEvent pj = new VoiceUserJoinedEvent(voiceUserId, memberId.toString(), confName, callerId, callerIdName, muted, speaking, "none");
conferenceEventListener.handleConferenceEvent(pj);
@@ -95,13 +91,9 @@ public class ESLEventListener implements IEslEventListener {
// (WebRTC) Deskstop sharing conferences' name is of the form ddddd-SCREENSHARE
// Voice conferences' name is of the form ddddd
if (confName.endsWith(SCREENSHARE_CONFERENCE_NAME_SUFFIX)) {
- System.out.println("User left deskshare conference, user=[" + memberId.toString() +
- "], " + "conf=[" + confName + "]");
DeskShareEndedEvent dsEnd = new DeskShareEndedEvent(confName, callerId, callerIdName);
conferenceEventListener.handleConferenceEvent(dsEnd);
} else {
- System.out.println("User left voice conference, user=[" + memberId.toString() + "], " +
- "conf=[" + confName + "]");
VoiceUserLeftEvent pl = new VoiceUserLeftEvent(memberId.toString(), confName);
conferenceEventListener.handleConferenceEvent(pl);
}
@@ -110,8 +102,6 @@ public class ESLEventListener implements IEslEventListener {
@Override
public void conferenceEventMute(String uniqueId, String confName, int confSize, EslEvent event) {
Integer memberId = this.getMemberIdFromEvent(event);
- System.out.println("******************** Received Conference Muted Event from FreeSWITCH user[" + memberId.toString() + "]");
- System.out.println("User muted voice conference, user=[" + memberId.toString() + "], conf=[" + confName + "]");
VoiceUserMutedEvent pm = new VoiceUserMutedEvent(memberId.toString(), confName, true);
conferenceEventListener.handleConferenceEvent(pm);
}
@@ -119,8 +109,6 @@ public class ESLEventListener implements IEslEventListener {
@Override
public void conferenceEventUnMute(String uniqueId, String confName, int confSize, EslEvent event) {
Integer memberId = this.getMemberIdFromEvent(event);
- System.out.println("******************** Received ConferenceUnmuted Event from FreeSWITCH user[" + memberId.toString() + "]");
- System.out.println("User unmuted voice conference, user=[" + memberId.toString() + "], conf=[" + confName + "]");
VoiceUserMutedEvent pm = new VoiceUserMutedEvent(memberId.toString(), confName, false);
conferenceEventListener.handleConferenceEvent(pm);
}
@@ -130,8 +118,6 @@ public class ESLEventListener implements IEslEventListener {
Integer memberId = this.getMemberIdFromEvent(event);
VoiceUserTalkingEvent pt;
- System.out.println("******************** Receive conference Action [" + action + "]");
-
if (action == null) {
return;
}
@@ -174,8 +160,6 @@ public class ESLEventListener implements IEslEventListener {
rtmp.setVideoWidth(Integer.parseInt(getBroadcastParameter(event, "vw")));
rtmp.setTimestamp(genTimestamp().toString());
- System.out.println("DeskShare conference broadcast started. url=["
- + getStreamUrl(event) + "], conf=[" + confName + "]");
conferenceEventListener.handleConferenceEvent(rtmp);
}
} else {
@@ -183,8 +167,6 @@ public class ESLEventListener implements IEslEventListener {
sre.setRecordingFilename(getRecordFilenameFromEvent(event));
sre.setTimestamp(genTimestamp().toString());
- System.out.println("Voice conference recording started. file=["
- + getRecordFilenameFromEvent(event) + "], conf=[" + confName + "]");
conferenceEventListener.handleConferenceEvent(sre);
}
} else if (action.equals(STOP_RECORDING_EVENT)) {
@@ -196,16 +178,12 @@ public class ESLEventListener implements IEslEventListener {
rtmp.setVideoWidth(Integer.parseInt(getBroadcastParameter(event, "vw")));
rtmp.setTimestamp(genTimestamp().toString());
- System.out.println("DeskShare conference broadcast stopped. url=["
- + getStreamUrl(event) + "], conf=[" + confName + "]");
conferenceEventListener.handleConferenceEvent(rtmp);
}
} else {
VoiceStartRecordingEvent sre = new VoiceStartRecordingEvent(confName, false);
sre.setRecordingFilename(getRecordFilenameFromEvent(event));
sre.setTimestamp(genTimestamp().toString());
- System.out.println("Voice conference recording stopped. file=["
- + getRecordFilenameFromEvent(event) + "], conf=[" + confName + "]");
conferenceEventListener.handleConferenceEvent(sre);
}
}
diff --git a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
index 4617acb274..dcfc6274f1 100755
--- a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
+++ b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
@@ -143,24 +143,18 @@ public class FreeswitchApplication {
public void run() {
if (command instanceof GetAllUsersCommand) {
GetAllUsersCommand cmd = (GetAllUsersCommand) command;
- System.out.println("Sending PopulateRoomCommand for conference = [" + cmd.getRoom() + "]");
manager.getUsers(cmd);
} else if (command instanceof MuteUserCommand) {
MuteUserCommand cmd = (MuteUserCommand) command;
- System.out.println("Sending MuteParticipantCommand for conference = [" + cmd.getRoom() + "]");
manager.mute(cmd);
} else if (command instanceof EjectUserCommand) {
EjectUserCommand cmd = (EjectUserCommand) command;
- System.out.println("Sending EjectParticipantCommand for conference = [" + cmd.getRoom() + "]");
manager.eject(cmd);
} else if (command instanceof EjectAllUsersCommand) {
EjectAllUsersCommand cmd = (EjectAllUsersCommand) command;
- System.out.println("Sending EjectAllUsersCommand for conference = [" + cmd.getRoom() + "]");
manager.ejectAll(cmd);
} else if (command instanceof TransferUserToMeetingCommand) {
TransferUserToMeetingCommand cmd = (TransferUserToMeetingCommand) command;
- System.out.println("Sending TransferUsetToMeetingCommand for conference = ["
- + cmd.getRoom() + "]");
manager.tranfer(cmd);
} else if (command instanceof RecordConferenceCommand) {
manager.record((RecordConferenceCommand) command);
diff --git a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/ScreenshareBroadcastRTMPCommand.java b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/ScreenshareBroadcastRTMPCommand.java
index c5de58bcbc..1629c70ffe 100755
--- a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/ScreenshareBroadcastRTMPCommand.java
+++ b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/ScreenshareBroadcastRTMPCommand.java
@@ -53,6 +53,5 @@ public class ScreenshareBroadcastRTMPCommand extends FreeswitchCommand {
public void handleResponse(EslMessage response, ConferenceEventListener eventListener) {
//Test for Known Conference
- System.out.println("\nScreenshareBroadcastRTMPCommand\n");
}
}
diff --git a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/ScreenshareHangUpCommand.java b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/ScreenshareHangUpCommand.java
index df72896e3f..a05e31aca9 100755
--- a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/ScreenshareHangUpCommand.java
+++ b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/ScreenshareHangUpCommand.java
@@ -29,7 +29,6 @@ public class ScreenshareHangUpCommand extends FreeswitchCommand {
}
public void handleResponse(EslMessage response, ConferenceEventListener eventListener) {
- System.out.println("\nScreenshareHangUpCommand\n");
}
}
diff --git a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/ScreenshareRecordCommand.java b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/ScreenshareRecordCommand.java
index 2d044171a8..1e704164e0 100755
--- a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/ScreenshareRecordCommand.java
+++ b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/ScreenshareRecordCommand.java
@@ -39,12 +39,10 @@ public class ScreenshareRecordCommand extends FreeswitchCommand {
if (record)
action = "record";
- System.out.println("\n\n\n\n\n SCREENSHARE RECORD " + record + "\n\n\n\n");
return SPACE + getRoom() + SPACE + action + SPACE + recordPath;
}
public void handleResponse(EslMessage response, ConferenceEventListener eventListener) {
//Test for Known Conference
- System.out.println("\n\n\n\n\nLALALALLALA\n\n\n\n");
}
}
diff --git a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/endpoint/redis/RedisPublisher.scala b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/endpoint/redis/RedisPublisher.scala
index d63e3b40c5..11acf3d06d 100755
--- a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/endpoint/redis/RedisPublisher.scala
+++ b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/endpoint/redis/RedisPublisher.scala
@@ -13,7 +13,7 @@ class RedisPublisher(val system: ActorSystem) extends SystemConfiguration {
redis.clientSetname("BbbFsEslAkkaPub")
def publish(channel: String, data: String) {
- println("PUBLISH TO [" + channel + "]: \n [" + data + "]")
+ //println("PUBLISH TO [" + channel + "]: \n [" + data + "]")
redis.publish(channel, data)
}
diff --git a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
index c6fac69976..b00b3acea2 100755
--- a/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
+++ b/akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
@@ -25,8 +25,6 @@ class VoiceConferenceService(sender: RedisPublisher) extends IVoiceConferenceSer
def userJoinedVoiceConf(voiceConfId: String, voiceUserId: String, userId: String, callerIdName: String,
callerIdNum: String, muted: java.lang.Boolean, talking: java.lang.Boolean, avatarURL: String) {
- println("******** FreeswitchConferenceService received voiceUserJoined vui=[" +
- userId + "] wui=[" + voiceUserId + "]")
val header = BbbCoreVoiceConfHeader(UserJoinedVoiceConfEvtMsg.NAME, voiceConfId)
val body = UserJoinedVoiceConfEvtMsgBody(voiceConfId, voiceUserId, userId, callerIdName, callerIdNum,
@@ -42,7 +40,6 @@ class VoiceConferenceService(sender: RedisPublisher) extends IVoiceConferenceSer
}
def userLeftVoiceConf(voiceConfId: String, voiceUserId: String) {
- println("******** FreeswitchConferenceService received voiceUserLeft vui=[" + voiceUserId + "] conference=[" + voiceConfId + "]")
val header = BbbCoreVoiceConfHeader(UserLeftVoiceConfEvtMsg.NAME, voiceConfId)
val body = UserLeftVoiceConfEvtMsgBody(voiceConfId, voiceUserId)
@@ -61,7 +58,6 @@ class VoiceConferenceService(sender: RedisPublisher) extends IVoiceConferenceSer
}
def userMutedInVoiceConf(voiceConfId: String, voiceUserId: String, muted: java.lang.Boolean) {
- println("******** FreeswitchConferenceService received voiceUserMuted vui=[" + voiceUserId + "] muted=[" + muted + "]")
val header = BbbCoreVoiceConfHeader(UserMutedInVoiceConfEvtMsg.NAME, voiceConfId)
val body = UserMutedInVoiceConfEvtMsgBody(voiceConfId, voiceUserId, muted.booleanValue())
@@ -76,7 +72,6 @@ class VoiceConferenceService(sender: RedisPublisher) extends IVoiceConferenceSer
}
def userTalkingInVoiceConf(voiceConfId: String, voiceUserId: String, talking: java.lang.Boolean) {
- println("******** FreeswitchConferenceService received voiceUserTalking vui=[" + voiceUserId + "] talking=[" + talking + "]")
val header = BbbCoreVoiceConfHeader(UserTalkingInVoiceConfEvtMsg.NAME, voiceConfId)
val body = UserTalkingInVoiceConfEvtMsgBody(voiceConfId, voiceUserId, talking.booleanValue())
@@ -91,7 +86,6 @@ class VoiceConferenceService(sender: RedisPublisher) extends IVoiceConferenceSer
}
def deskShareStarted(voiceConfId: String, callerIdNum: String, callerIdName: String) {
- println("******** FreeswitchConferenceService send deskShareStarted to BBB " + voiceConfId)
val header = BbbCoreVoiceConfHeader(ScreenshareStartedVoiceConfEvtMsg.NAME, voiceConfId)
val body = ScreenshareStartedVoiceConfEvtMsgBody(voiceConf = voiceConfId, screenshareConf = voiceConfId,
@@ -106,7 +100,6 @@ class VoiceConferenceService(sender: RedisPublisher) extends IVoiceConferenceSer
}
def deskShareEnded(voiceConfId: String, callerIdNum: String, callerIdName: String) {
- println("******** FreeswitchConferenceService send deskShareStopped to BBB " + voiceConfId)
val header = BbbCoreVoiceConfHeader(ScreenshareStoppedVoiceConfEvtMsg.NAME, voiceConfId)
val body = ScreenshareStoppedVoiceConfEvtMsgBody(voiceConf = voiceConfId, screenshareConf = voiceConfId,
@@ -121,7 +114,6 @@ class VoiceConferenceService(sender: RedisPublisher) extends IVoiceConferenceSer
}
def deskShareRTMPBroadcastStarted(voiceConfId: String, streamname: String, vw: java.lang.Integer, vh: java.lang.Integer, timestamp: String) {
- println("******** FreeswitchConferenceService send deskShareRTMPBroadcastStarted to BBB " + voiceConfId)
val header = BbbCoreVoiceConfHeader(ScreenshareRtmpBroadcastStartedVoiceConfEvtMsg.NAME, voiceConfId)
val body = ScreenshareRtmpBroadcastStartedVoiceConfEvtMsgBody(voiceConf = voiceConfId, screenshareConf = voiceConfId,
@@ -138,7 +130,6 @@ class VoiceConferenceService(sender: RedisPublisher) extends IVoiceConferenceSer
}
def deskShareRTMPBroadcastStopped(voiceConfId: String, streamname: String, vw: java.lang.Integer, vh: java.lang.Integer, timestamp: String) {
- println("******** FreeswitchConferenceService send deskShareRTMPBroadcastStopped to BBB " + voiceConfId)
val header = BbbCoreVoiceConfHeader(ScreenshareRtmpBroadcastStoppedVoiceConfEvtMsg.NAME, voiceConfId)
val body = ScreenshareRtmpBroadcastStoppedVoiceConfEvtMsgBody(voiceConf = voiceConfId, screenshareConf = voiceConfId,
diff --git a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/ClientGWApplication.scala b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/ClientGWApplication.scala
index 9f89f571b6..db86d661d7 100755
--- a/bbb-apps-common/src/main/scala/org/bigbluebutton/client/ClientGWApplication.scala
+++ b/bbb-apps-common/src/main/scala/org/bigbluebutton/client/ClientGWApplication.scala
@@ -18,7 +18,6 @@ class ClientGWApplication(val msgToClientGW: MsgToClientGW,
val log = Logging(system, getClass)
- println("*********** meetingManagerChannel = " + meetingManagerChannel)
log.debug("*********** meetingManagerChannel = " + meetingManagerChannel)
private val msgFromClientEventBus = new MsgFromClientEventBus
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java
index 4534ba22ec..774f3a28b3 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java
@@ -501,8 +501,6 @@ public class ParamsProcessorUtil {
try {
HttpGet httpget = new HttpGet(url);
- System.out.println("Executing request " + httpget.getRequestLine());
-
// Create a custom response handler
ResponseHandler<String> responseHandler = new ResponseHandler<String>() {
@@ -520,8 +518,6 @@ public class ParamsProcessorUtil {
};
String responseBody = httpclient.execute(httpget, responseHandler);
- System.out.println("----------------------------------------");
- System.out.println(responseBody);
configXML = responseBody;
} catch(IOException ex) {
// IOException
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java b/bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
index dc4ec3c5a6..d4a8065d47 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
@@ -244,8 +244,6 @@ public class PresentationUrlDownloadService {
};
Future<File> future = httpclient.execute(HttpAsyncMethods.createGet(finalUrl), consumer, null);
File result = future.get();
- System.out.println("Response file length: " + result.length());
- System.out.println("Shutting down");
success = result.exists();
} catch (java.lang.InterruptedException ex) {
diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
index c8df61d596..231b511c3d 100755
--- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
+++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
@@ -24,7 +24,6 @@ class BbbWebApiGWApp(val oldMessageReceivedGW: OldMessageReceivedGW,
val log = Logging(system, getClass)
- println("*********** meetingManagerChannel = " + meetingManagerChannel)
log.debug("*********** meetingManagerChannel = " + meetingManagerChannel)
private val jsonMsgToAkkaAppsBus = new JsonMsgToAkkaAppsBus
@@ -141,19 +140,16 @@ class BbbWebApiGWApp(val oldMessageReceivedGW: OldMessageReceivedGW,
def destroyMeeting (msg: DestroyMeetingMessage): Unit = {
val event = MsgBuilder.buildDestroyMeetingSysCmdMsg(msg)
- println(event)
msgToAkkaAppsEventBus.publish(MsgToAkkaApps(toAkkaAppsChannel, event))
}
def endMeeting(msg: EndMeetingMessage): Unit = {
val event = MsgBuilder.buildEndMeetingSysCmdMsg(msg)
- println(event)
msgToAkkaAppsEventBus.publish(MsgToAkkaApps(toAkkaAppsChannel, event))
}
def sendKeepAlive(system: String, timestamp: java.lang.Long): Unit = {
val event = MsgBuilder.buildCheckAlivePingSysMsg(system, timestamp.longValue())
- println(event)
msgToAkkaAppsEventBus.publish(MsgToAkkaApps(toAkkaAppsChannel, event))
}
@@ -177,23 +173,18 @@ class BbbWebApiGWApp(val oldMessageReceivedGW: OldMessageReceivedGW,
def sendDocConversionMsg(msg: IDocConversionMsg): Unit = {
if (msg.isInstanceOf[DocPageGeneratedProgress]) {
val event = MsgBuilder.buildPresentationPageGeneratedPubMsg(msg.asInstanceOf[DocPageGeneratedProgress])
- println(event)
msgToAkkaAppsEventBus.publish(MsgToAkkaApps(toAkkaAppsChannel, event))
} else if (msg.isInstanceOf[OfficeDocConversionProgress]) {
val event = MsgBuilder.buildPresentationConversionUpdateSysPubMsg(msg.asInstanceOf[OfficeDocConversionProgress])
- println(event)
msgToAkkaAppsEventBus.publish(MsgToAkkaApps(toAkkaAppsChannel, event))
} else if (msg.isInstanceOf[DocPageCompletedProgress]) {
val event = MsgBuilder.buildPresentationConversionCompletedSysPubMsg(msg.asInstanceOf[DocPageCompletedProgress])
- println(event)
msgToAkkaAppsEventBus.publish(MsgToAkkaApps(toAkkaAppsChannel, event))
} else if (msg.isInstanceOf[DocPageCountFailed]) {
val event = MsgBuilder.buildbuildPresentationPageCountFailedSysPubMsg(msg.asInstanceOf[DocPageCountFailed])
- println(event)
msgToAkkaAppsEventBus.publish(MsgToAkkaApps(toAkkaAppsChannel, event))
} else if (msg.isInstanceOf[DocPageCountExceeded]) {
val event = MsgBuilder.buildPresentationPageCountExceededSysPubMsg(msg.asInstanceOf[DocPageCountExceeded])
- println(event)
msgToAkkaAppsEventBus.publish(MsgToAkkaApps(toAkkaAppsChannel, event))
}
}
diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
index 941769d03b..d3c3523499 100755
--- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
+++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
@@ -45,7 +45,6 @@ class ReceivedJsonMsgHdlrActor(val msgFromAkkaAppsEventBus: MsgFromAkkaAppsEvent
def receive = {
case msg: JsonMsgFromAkkaApps => handleReceivedJsonMessage(msg)
-
case _ => // do nothing
}
@@ -56,10 +55,9 @@ class ReceivedJsonMsgHdlrActor(val msgFromAkkaAppsEventBus: MsgFromAkkaAppsEvent
}
def handle(envelope: BbbCoreEnvelope, jsonNode: JsonNode): Unit = {
- log.debug("*************** Route envelope name " + envelope.name)
+ //log.debug("*************** Route envelope name " + envelope.name)
envelope.name match {
case MeetingCreatedEvtMsg.NAME =>
- log.debug("**************** Route MeetingCreatedEvtMsg")
route[MeetingCreatedEvtMsg](envelope, jsonNode)
case MeetingEndedEvtMsg.NAME =>
route[MeetingEndedEvtMsg](envelope, jsonNode)
@@ -84,9 +82,8 @@ class ReceivedJsonMsgHdlrActor(val msgFromAkkaAppsEventBus: MsgFromAkkaAppsEvent
case CreateBreakoutRoomSysCmdMsg.NAME =>
route[CreateBreakoutRoomSysCmdMsg](envelope, jsonNode)
-
case _ =>
- log.debug("************ Cannot route envelope name " + envelope.name)
+ //log.debug("************ Cannot route envelope name " + envelope.name)
// do nothing
}
}
diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/RedisPublisher.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/RedisPublisher.scala
index d720c7eef4..23e47ddd06 100755
--- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/RedisPublisher.scala
+++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/RedisPublisher.scala
@@ -17,7 +17,7 @@ class RedisPublisher(val system: ActorSystem) extends SystemConfiguration {
redis.clientSetname("BbbWebPub")
def publish(channel: String, data: String) {
- log.debug("PUBLISH TO \n[" + channel + "]: \n " + data + "\n")
+ //log.debug("PUBLISH TO \n[" + channel + "]: \n " + data + "\n")
redis.publish(channel, ByteString(data))
}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
index d15d351dd5..456390ea16 100755
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
+++ b/bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
@@ -331,7 +331,6 @@ public class ConnectionInvokerService implements IConnectionInvokerService {
}
Gson gson = new Gson();
String json = gson.toJson(msg.getMessage());
- System.out.println("Handle direct message: " + msg.getMessageName() + " msg=" + json);
final String userId = msg.getUserID();
Runnable sender = new Runnable() {
@@ -353,7 +352,6 @@ public class ConnectionInvokerService implements IConnectionInvokerService {
}
Gson gson = new Gson();
String json = gson.toJson(msg.getMessage());
- System.out.println("Send direct message: " + msg.getMessageName() + " msg=" + json);
ServiceUtils.invokeOnConnection(conn, "onMessageFromServer", params.toArray());
}
} else {
--
GitLab