mirror of https://github.com/OpenVidu/openvidu.git
openvidu-server: make some methods public for easier testing in PRO
parent
a002e766ca
commit
20630c0553
|
|
@ -37,7 +37,6 @@ import org.springframework.web.filter.CorsFilter;
|
|||
import io.openvidu.server.rest.RequestMappings;
|
||||
|
||||
@Configuration()
|
||||
@ConditionalOnMissingBean(name = "securityConfigPro")
|
||||
@Order(Ordered.LOWEST_PRECEDENCE)
|
||||
public class SecurityConfig {
|
||||
|
||||
|
|
@ -48,6 +47,7 @@ public class SecurityConfig {
|
|||
protected Environment environment;
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean(name = "securityConfigPro")
|
||||
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
|
||||
// Configure CORS and CSRF
|
||||
configureHttpSecurity(http);
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ public class ComposedQuickStartRecordingService extends ComposedRecordingService
|
|||
}
|
||||
|
||||
@Override
|
||||
protected Recording startRecordingWithVideo(Session session, Recording recording, RecordingProperties properties)
|
||||
public Recording startRecordingWithVideo(Session session, Recording recording, RecordingProperties properties)
|
||||
throws OpenViduException {
|
||||
|
||||
log.info("Starting COMPOSED_QUICK_START ({}) recording {} of session {}",
|
||||
|
|
@ -117,7 +117,7 @@ public class ComposedQuickStartRecordingService extends ComposedRecordingService
|
|||
}
|
||||
|
||||
@Override
|
||||
protected Recording stopRecordingWithVideo(Session session, Recording recording, EndReason reason) {
|
||||
public Recording stopRecordingWithVideo(Session session, Recording recording, EndReason reason) {
|
||||
log.info("Stopping COMPOSED_QUICK_START ({}) recording {} of session {}. Reason: {}",
|
||||
recording.hasAudio() ? "video + audio" : "audio-only", recording.getId(), recording.getSessionId(),
|
||||
RecordingManager.finalReason(reason));
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ public class ComposedRecordingService extends RecordingService {
|
|||
compositeWrapper.disconnectPublisherEndpoint(streamId);
|
||||
}
|
||||
|
||||
protected Recording startRecordingWithVideo(Session session, Recording recording, RecordingProperties properties)
|
||||
public Recording startRecordingWithVideo(Session session, Recording recording, RecordingProperties properties)
|
||||
throws OpenViduException {
|
||||
|
||||
log.info("Starting composed ({}) recording {} of session {}",
|
||||
|
|
@ -217,7 +217,7 @@ public class ComposedRecordingService extends RecordingService {
|
|||
return recording;
|
||||
}
|
||||
|
||||
protected Recording stopRecordingWithVideo(Session session, Recording recording, EndReason reason) {
|
||||
public Recording stopRecordingWithVideo(Session session, Recording recording, EndReason reason) {
|
||||
|
||||
log.info("Stopping composed ({}) recording {} of session {}. Reason: {}",
|
||||
recording.hasAudio() ? "video + audio" : "video-only", recording.getId(), recording.getSessionId(),
|
||||
|
|
@ -396,7 +396,7 @@ public class ComposedRecordingService extends RecordingService {
|
|||
dockerManager.removeContainer(recording.getRecordingProperties().mediaNode(), containerId, false);
|
||||
}
|
||||
|
||||
protected void updateRecordingAttributes(Recording recording) {
|
||||
public void updateRecordingAttributes(Recording recording) {
|
||||
String infoFilePath = this.openviduConfig.getOpenViduRecordingPath()
|
||||
+ recording.getId() + "/" + recording.getId() + RecordingService.COMPOSED_INFO_FILE_EXTENSION;
|
||||
|
||||
|
|
@ -457,7 +457,7 @@ public class ComposedRecordingService extends RecordingService {
|
|||
throw e;
|
||||
}
|
||||
|
||||
protected void downloadComposedRecording(final Session session, final Recording recording, final EndReason reason) {
|
||||
public void downloadComposedRecording(final Session session, final Recording recording, final EndReason reason) {
|
||||
try {
|
||||
this.recordingDownloader.downloadRecording(recording, null, () -> {
|
||||
|
||||
|
|
|
|||
|
|
@ -775,7 +775,7 @@ public class RecordingManager {
|
|||
}
|
||||
}
|
||||
|
||||
protected void checkRecordingPaths(String openviduRecordingPath, String openviduRecordingCustomLayout)
|
||||
public void checkRecordingPaths(String openviduRecordingPath, String openviduRecordingCustomLayout)
|
||||
throws OpenViduException {
|
||||
log.info("Initializing recording paths");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
server.port=7777
|
||||
server.ssl.enabled=false
|
||||
management.metrics.export.elastic.enabled=false
|
||||
management.elastic.metrics.export.enabled=false
|
||||
spring.main.allow-circular-references=true
|
||||
Loading…
Reference in New Issue