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

openvidu-server: resetting process fix

pull/375/head
pabloFuente 2019-06-12 16:18:08 +02:00
parent dfb9fcfa75
commit 4c8f7229f2
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSession.java
View File

@ -251,19 +251,20 @@ public class KurentoSession extends Session {
private void closePipeline(Runnable callback) { private void closePipeline(Runnable callback) {
synchronized (pipelineReleaseLock) { synchronized (pipelineReleaseLock) {
this.pipelineLatch = new CountDownLatch(1);
this.pipelineCreationErrorCause = null;
if (pipeline == null) { if (pipeline == null) {
if (callback != null) {
callback.run();
}
return; return;
} }
getPipeline().release(new Continuation<Void>() { getPipeline().release(new Continuation<Void>() {
@Override @Override
public void onSuccess(Void result) throws Exception { public void onSuccess(Void result) throws Exception {
log.debug("SESSION {}: Released Pipeline", sessionId); log.debug("SESSION {}: Released Pipeline", sessionId);
pipeline = null; pipeline = null;
pipelineLatch = new CountDownLatch(1); pipelineLatch = new CountDownLatch(1);
pipelineCreationErrorCause = null;
if (callback != null) { if (callback != null) {
callback.run(); callback.run();
} }
@ -274,6 +275,7 @@ public class KurentoSession extends Session {
log.warn("SESSION {}: Could not successfully release Pipeline", sessionId, cause); log.warn("SESSION {}: Could not successfully release Pipeline", sessionId, cause);
pipeline = null; pipeline = null;
pipelineLatch = new CountDownLatch(1); pipelineLatch = new CountDownLatch(1);
pipelineCreationErrorCause = null;
if (callback != null) { if (callback != null) {
callback.run(); callback.run();
} }
@ -288,7 +290,7 @@ public class KurentoSession extends Session {
public void restartStatusInKurento() { public void restartStatusInKurento() {
log.info("Reseting remote media objects for active session {}", this.sessionId); log.info("Reseting process: reseting remote media objects for active session {}", this.sessionId);
// Stop recording if session is being recorded // Stop recording if session is being recorded
if (recordingManager.sessionIsBeingRecorded(this.sessionId)) { if (recordingManager.sessionIsBeingRecorded(this.sessionId)) {
@ -309,7 +311,9 @@ public class KurentoSession extends Session {
// Release pipeline, create a new one and prepare new PublisherEndpoints for // Release pipeline, create a new one and prepare new PublisherEndpoints for
// allowed users // allowed users
log.info("Reseting process: closing media pipeline for active session {}", this.sessionId);
this.closePipeline(() -> { this.closePipeline(() -> {
log.info("Reseting process: media pipeline closed for active session {}", this.sessionId);
createPipeline(); createPipeline();
try { try {
if (!pipelineLatch.await(20, TimeUnit.SECONDS)) { if (!pipelineLatch.await(20, TimeUnit.SECONDS)) {
@ -320,6 +324,9 @@ public class KurentoSession extends Session {
((KurentoParticipant) p).resetPublisherEndpoint(); ((KurentoParticipant) p).resetPublisherEndpoint();
} }
}); });
log.info(
"Reseting process: media pipeline created and publisher endpoints reseted for active session {}",
this.sessionId);
} catch (Exception e) { } catch (Exception e) {
log.error("Error waiting to new MediaPipeline on KurentoSession restart: {}", e.getMessage()); log.error("Error waiting to new MediaPipeline on KurentoSession restart: {}", e.getMessage());
} }