Skip to content

Commit b9b9328

Browse files
committed
- remote logging noise
1 parent 16bbf72 commit b9b9328

File tree

12 files changed

+17
-549
lines changed

12 files changed

+17
-549
lines changed

bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java

+5-41
Original file line numberDiff line numberDiff line change
@@ -34,89 +34,67 @@
3434
import org.red5.server.api.IContext;
3535
import org.red5.server.api.scope.IScope;
3636
import org.slf4j.Logger;
37-
import org.springframework.context.ApplicationEvent;
38-
import org.springframework.context.ApplicationListener;
39-
import org.springframework.context.support.AbstractApplicationContext;
4037
import com.google.gson.Gson;
4138

4239
public class BigBlueButtonApplication extends MultiThreadedApplicationAdapter {
4340
private static Logger log = Red5LoggerFactory.getLogger(BigBlueButtonApplication.class, "bigbluebutton");
4441

4542
private RecorderApplication recorderApplication;
46-
private AbstractApplicationContext appCtx;
4743
private ConnectionInvokerService connInvokerService;
4844
private IBigBlueButtonInGW bbbGW;
4945

5046
private static final String APP = "BBB";
5147

5248
@Override
5349
public boolean appConnect(IConnection conn, Object[] params) {
54-
log.debug("***** " + APP + " [ " + " appConnect *********");
5550
return super.appConnect(conn, params);
5651
}
5752

5853
@Override
5954
public void appDisconnect(IConnection conn) {
60-
log.debug("***** " + APP + " [ " + " appDisconnect *********");
6155
super.appDisconnect(conn);
6256
}
6357

6458
@Override
6559
public boolean appJoin(IClient client, IScope scope) {
66-
log.debug("***** " + APP + " [ " + " appJoin [ " + scope.getName() + "] *********");
6760
return super.appJoin(client, scope);
6861
}
6962

7063
@Override
7164
public void appLeave(IClient client, IScope scope) {
72-
log.debug("***** " + APP + " [ " + " appLeave [ " + scope.getName() + "] *********");
7365
super.appLeave(client, scope);
7466
}
7567

7668
@Override
7769
public boolean roomJoin(IClient client, IScope scope) {
78-
log.debug("***** " + APP + " [ " + " roomJoin [ " + scope.getName() + "] *********");
7970
return super.roomJoin(client, scope);
8071
}
8172

8273
@Override
8374
public void roomLeave(IClient client, IScope scope) {
84-
log.debug("***** " + APP + " [ " + " roomLeave [ " + scope.getName() + "] *********");
8575
super.roomLeave(client, scope);
8676
}
8777

8878
@Override
89-
public boolean appStart(IScope app) {
90-
log.debug("***** " + APP + " [ " + " appStart [ " + scope.getName() + "] *********");
91-
IContext context = app.getContext();
92-
appCtx = (AbstractApplicationContext) context.getApplicationContext();
93-
appCtx.addApplicationListener(new ShutdownHookListener());
94-
appCtx.registerShutdownHook();
95-
super.appStart(app);
96-
79+
public boolean appStart(IScope app) {
80+
super.appStart(app);
9781
connInvokerService.setAppScope(app);
98-
9982
return true;
10083
}
10184

10285
@Override
10386
public void appStop(IScope app) {
104-
log.debug("***** " + APP + " [ " + " appStop [ " + scope.getName() + "] *********");
10587
super.appStop(app);
10688
}
10789

10890
@Override
10991
public boolean roomStart(IScope room) {
110-
log.debug("***** " + APP + " [ " + " roomStart [ " + scope.getName() + "] *********");
111-
11292
connInvokerService.addScope(room.getName(), room);
11393
return super.roomStart(room);
11494
}
11595

11696
@Override
11797
public void roomStop(IScope room) {
118-
log.debug("***** " + APP + " [ " + " roomStop [ " + scope.getName() + "] *********");
119-
12098
recorderApplication.destroyRecordSession(room.getName());
12199
connInvokerService.removeScope(room.getName());
122100

@@ -125,8 +103,6 @@ public void roomStop(IScope room) {
125103

126104
@Override
127105
public boolean roomConnect(IConnection connection, Object[] params) {
128-
log.debug("***** " + APP + " [ " + " roomConnect [ " + connection.getScope().getName() + "] *********");
129-
130106
String username = ((String) params[0]).toString();
131107
String role = ((String) params[1]).toString();
132108
String room = ((String)params[2]).toString();
@@ -181,7 +157,7 @@ boolean record = (Boolean)params[4];
181157
String connId = Red5.getConnectionLocal().getSessionId();
182158

183159
log.info("User connected: sessionId=[" + connId + "], encoding=[" + connType +
184-
"(persistent=RTMP,polling=RTMPT)], meetingId= [" + meetingId
160+
"], meetingId= [" + meetingId
185161
+ "], userId=[" + userId + "] username=[" + userFullname +"]");
186162

187163

@@ -215,8 +191,7 @@ private String getConnectionType(String connType) {
215191

216192
@Override
217193
public void roomDisconnect(IConnection conn) {
218-
log.debug("***** " + APP + " [ " + " roomDisconnect [ " + conn.getScope().getName() + "] *********");
219-
194+
220195
String remoteHost = Red5.getConnectionLocal().getRemoteAddress();
221196
int remotePort = Red5.getConnectionLocal().getRemotePort();
222197
String clientId = Red5.getConnectionLocal().getClient().getId();
@@ -233,7 +208,7 @@ public void roomDisconnect(IConnection conn) {
233208
String connId = Red5.getConnectionLocal().getSessionId();
234209

235210
log.info("User disconnected: sessionId=[" + connId + "], encoding=[" + connType +
236-
"(persistent=RTMP,polling=RTMPT)], meetingId= [" + meetingId + "], userId=[" + userId + "] username=[" + userFullname +"]");
211+
"], meetingId= [" + meetingId + "], userId=[" + userId + "] username=[" + userFullname +"]");
237212

238213
Map<String, Object> logData = new HashMap<String, Object>();
239214
logData.put("meetingId", meetingId);
@@ -293,15 +268,4 @@ public void setConnInvokerService(ConnectionInvokerService connInvokerService) {
293268
public void setBigBlueButtonInGW(IBigBlueButtonInGW bbbGW) {
294269
this.bbbGW = bbbGW;
295270
}
296-
297-
private class ShutdownHookListener implements ApplicationListener<ApplicationEvent> {
298-
299-
@Override
300-
public void onApplicationEvent(ApplicationEvent event) {
301-
if (event instanceof org.springframework.context.event.ContextStoppedEvent) {
302-
log.info("Received shutdown event. Red5 is shutting down. Destroying all rooms.");
303-
}
304-
}
305-
306-
}
307271
}

bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatHandler.java

-114
This file was deleted.

bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutHandler.java

-115
This file was deleted.

0 commit comments

Comments
 (0)