ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-server: QuarantineKiller

pull/331/head
pabloFuente 2019-10-04 11:12:40 +02:00
parent 5f1f360a5b
commit e8e85a2c58
4 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java
View File

@ -66,6 +66,8 @@ import io.openvidu.server.rpc.RpcNotificationService;
import io.openvidu.server.utils.CommandExecutor;
import io.openvidu.server.utils.GeoLocationByIp;
import io.openvidu.server.utils.GeoLocationByIpDummy;
import io.openvidu.server.utils.QuarantineKiller;
import io.openvidu.server.utils.QuarantineKillerDummy;
import io.openvidu.server.webhook.CDRLoggerWebhook;
/**
@ -179,6 +181,12 @@ public class OpenViduServer implements JsonRpcConfigurer {
return new GeoLocationByIpDummy();
}
@Bean
@ConditionalOnMissingBean
public QuarantineKiller quarantineKiller() {
return new QuarantineKillerDummy();
}
@Override
public void registerJsonRpcHandlers(JsonRpcHandlerRegistry registry) {
registry.addHandler(rpcHandler().withPingWatchdog(true).withInterceptors(new HttpHandshakeInterceptor()),

10
openvidu-server/src/main/java/io/openvidu/server/core/SessionManager.java
View File

@ -51,6 +51,7 @@ import io.openvidu.server.kurento.core.KurentoTokenOptions;
import io.openvidu.server.recording.service.RecordingManager;
import io.openvidu.server.utils.FormatChecker;
import io.openvidu.server.utils.GeoLocation;
import io.openvidu.server.utils.QuarantineKiller;
public abstract class SessionManager {
@ -71,6 +72,9 @@ public abstract class SessionManager {
@Autowired
protected TokenGenerator tokenGenerator;
@Autowired
protected QuarantineKiller quarantineKiller;
public FormatChecker formatChecker = new FormatChecker();
protected ConcurrentMap<String, Session> sessions = new ConcurrentHashMap<>();
@ -500,6 +504,8 @@ public abstract class SessionManager {
recordingManager.stopRecording(session, null, RecordingManager.finalReason(reason));
}
final String mediaServerId = session.getMediaServerId();
if (session.close(reason)) {
sessionEventsHandler.onSessionClosed(session.getSessionId(), reason);
}
@ -507,6 +513,10 @@ public abstract class SessionManager {
this.cleanCollections(session.getSessionId());
log.info("Session '{}' removed and closed", session.getSessionId());
if (mediaServerId != null) {
this.quarantineKiller.dropMediaServer(mediaServerId);
}
}
protected void cleanCollections(String sessionId) {

7
openvidu-server/src/main/java/io/openvidu/server/utils/QuarantineKiller.java Normal file
View File

@ -0,0 +1,7 @@
package io.openvidu.server.utils;
public interface QuarantineKiller {
public void dropMediaServer(String mediaServerId);
}

9
openvidu-server/src/main/java/io/openvidu/server/utils/QuarantineKillerDummy.java Normal file
View File

@ -0,0 +1,9 @@
package io.openvidu.server.utils;
public class QuarantineKillerDummy implements QuarantineKiller {
@Override
public void dropMediaServer(String mediaServerId) {
}
}