mirror of https://github.com/OpenVidu/openvidu.git
openvidu-server: revert commit reversion, without polling thread bug
parent
c6687efe0e
commit
c9aed9da7b
|
@ -36,12 +36,14 @@ public class OpenViduException extends JsonRpcErrorException {
|
||||||
ROOM_CANNOT_BE_CREATED_ERROR_CODE(204), ROOM_CLOSED_ERROR_CODE(203), ROOM_NOT_FOUND_ERROR_CODE(202),
|
ROOM_CANNOT_BE_CREATED_ERROR_CODE(204), ROOM_CLOSED_ERROR_CODE(203), ROOM_NOT_FOUND_ERROR_CODE(202),
|
||||||
ROOM_GENERIC_ERROR_CODE(201),
|
ROOM_GENERIC_ERROR_CODE(201),
|
||||||
|
|
||||||
USER_ALREADY_STREAMING_ERROR_CODE(106), USER_NOT_STREAMING_ERROR_CODE(105), EXISTING_USER_IN_ROOM_ERROR_CODE(104), USER_CLOSED_ERROR_CODE(103),
|
USER_ALREADY_STREAMING_ERROR_CODE(106), USER_NOT_STREAMING_ERROR_CODE(105),
|
||||||
USER_NOT_FOUND_ERROR_CODE(102), USER_GENERIC_ERROR_CODE(10),
|
EXISTING_USER_IN_ROOM_ERROR_CODE(104), USER_CLOSED_ERROR_CODE(103), USER_NOT_FOUND_ERROR_CODE(102),
|
||||||
|
USER_GENERIC_ERROR_CODE(10),
|
||||||
|
|
||||||
USER_UNAUTHORIZED_ERROR_CODE(401), ROLE_NOT_FOUND_ERROR_CODE(402), SESSIONID_CANNOT_BE_CREATED_ERROR_CODE(403),
|
USER_UNAUTHORIZED_ERROR_CODE(401), ROLE_NOT_FOUND_ERROR_CODE(402), SESSIONID_CANNOT_BE_CREATED_ERROR_CODE(403),
|
||||||
TOKEN_CANNOT_BE_CREATED_ERROR_CODE(404), EXISTING_FILTER_ALREADY_APPLIED_ERROR_CODE(405),
|
TOKEN_CANNOT_BE_CREATED_ERROR_CODE(404), EXISTING_FILTER_ALREADY_APPLIED_ERROR_CODE(405),
|
||||||
FILTER_NOT_APPLIED_ERROR_CODE(406), FILTER_EVENT_LISTENER_NOT_FOUND(407),
|
FILTER_NOT_APPLIED_ERROR_CODE(406), FILTER_EVENT_LISTENER_NOT_FOUND_ERROR_CODE(407),
|
||||||
|
PUBLISHER_ENDPOINT_NOT_FOUND_ERROR_CODE(408),
|
||||||
|
|
||||||
USER_METADATA_FORMAT_INVALID_ERROR_CODE(500),
|
USER_METADATA_FORMAT_INVALID_ERROR_CODE(500),
|
||||||
|
|
||||||
|
|
|
@ -750,8 +750,14 @@ public class KurentoSessionManager extends SessionManager {
|
||||||
KurentoParticipant kParticipant = (KurentoParticipant) participant;
|
KurentoParticipant kParticipant = (KurentoParticipant) participant;
|
||||||
log.debug("Request [ICE_CANDIDATE] endpoint={} candidate={} " + "sdpMLineIdx={} sdpMid={} ({})",
|
log.debug("Request [ICE_CANDIDATE] endpoint={} candidate={} " + "sdpMLineIdx={} sdpMid={} ({})",
|
||||||
endpointName, candidate, sdpMLineIndex, sdpMid, participant.getParticipantPublicId());
|
endpointName, candidate, sdpMLineIndex, sdpMid, participant.getParticipantPublicId());
|
||||||
|
if (kParticipant.isPublisherEndpointDefined()) {
|
||||||
kParticipant.addIceCandidate(endpointName, new IceCandidate(candidate, sdpMid, sdpMLineIndex));
|
kParticipant.addIceCandidate(endpointName, new IceCandidate(candidate, sdpMid, sdpMLineIndex));
|
||||||
sessionEventsHandler.onRecvIceCandidate(participant, transactionId, null);
|
sessionEventsHandler.onRecvIceCandidate(participant, transactionId, null);
|
||||||
|
} else {
|
||||||
|
throw new OpenViduException(Code.PUBLISHER_ENDPOINT_NOT_FOUND_ERROR_CODE,
|
||||||
|
"Request to onIceCandidate for connection " + endpointName
|
||||||
|
+ " gone wrong. There is no publisher endpoint available");
|
||||||
|
}
|
||||||
} catch (OpenViduException e) {
|
} catch (OpenViduException e) {
|
||||||
log.error("PARTICIPANT {}: Error receiving ICE " + "candidate (epName={}, candidate={})",
|
log.error("PARTICIPANT {}: Error receiving ICE " + "candidate (epName={}, candidate={})",
|
||||||
participant.getParticipantPublicId(), endpointName, candidate, e);
|
participant.getParticipantPublicId(), endpointName, candidate, e);
|
||||||
|
@ -1374,7 +1380,7 @@ public class KurentoSessionManager extends SessionManager {
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("Request to addFilterEventListener to stream {} gone wrong. Error: {}", streamId,
|
log.error("Request to addFilterEventListener to stream {} gone wrong. Error: {}", streamId,
|
||||||
e.getMessage());
|
e.getMessage());
|
||||||
throw new OpenViduException(Code.FILTER_EVENT_LISTENER_NOT_FOUND,
|
throw new OpenViduException(Code.FILTER_EVENT_LISTENER_NOT_FOUND_ERROR_CODE,
|
||||||
"Request to addFilterEventListener to stream " + streamId + " gone wrong: " + e.getMessage());
|
"Request to addFilterEventListener to stream " + streamId + " gone wrong: " + e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -158,7 +158,7 @@ public class PublisherEndpoint extends MediaEndpoint {
|
||||||
String streamId = this.getStreamId();
|
String streamId = this.getStreamId();
|
||||||
log.error("Request to removeFilterEventListener to stream {} gone wrong: Filter {} has no listener added",
|
log.error("Request to removeFilterEventListener to stream {} gone wrong: Filter {} has no listener added",
|
||||||
streamId, eventType);
|
streamId, eventType);
|
||||||
throw new OpenViduException(Code.FILTER_EVENT_LISTENER_NOT_FOUND,
|
throw new OpenViduException(Code.FILTER_EVENT_LISTENER_NOT_FOUND_ERROR_CODE,
|
||||||
"Request to removeFilterEventListener to stream " + streamId + " gone wrong: Filter " + eventType
|
"Request to removeFilterEventListener to stream " + streamId + " gone wrong: Filter " + eventType
|
||||||
+ " has no listener added");
|
+ " has no listener added");
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +1,6 @@
|
||||||
package io.openvidu.test.e2e;
|
package io.openvidu.test.e2e;
|
||||||
|
|
||||||
import java.time.Duration;
|
|
||||||
import java.time.temporal.ChronoUnit;
|
|
||||||
|
|
||||||
import org.openqa.selenium.WebDriver;
|
import org.openqa.selenium.WebDriver;
|
||||||
import org.openqa.selenium.support.ui.ExpectedCondition;
|
|
||||||
import org.openqa.selenium.support.ui.WebDriverWait;
|
import org.openqa.selenium.support.ui.WebDriverWait;
|
||||||
|
|
||||||
import io.openvidu.test.browsers.BrowserUser;
|
import io.openvidu.test.browsers.BrowserUser;
|
||||||
|
|
Loading…
Reference in New Issue