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

openvidu-server: openvidu.recording.autostop-timeout added to GET /config

pull/203/head
pabloFuente 2019-02-14 11:50:28 +01:00
parent 813893798b
commit cde8290039
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,13 +244,13 @@ public class OpenViduServer implements JsonRpcConfigurer {
} else if (e.getCodeValue() == Code.RECORDING_PATH_NOT_VALID.getValue()) { } else if (e.getCodeValue() == Code.RECORDING_PATH_NOT_VALID.getValue()) {
finalErrorMessage = "Error initializing recording path \"" finalErrorMessage = "Error initializing recording path \""
+ this.openviduConfig().getOpenViduRecordingPath() + this.openviduConfig().getOpenViduRecordingPath()
+ "\" set with system property \"openvidu.recording.path\". Shutting down OpenVidu Server"; + "\" set with system property \"openvidu.recording.path\"";
} else if (e.getCodeValue() == Code.RECORDING_FILE_EMPTY_ERROR.getValue()) { } else if (e.getCodeValue() == Code.RECORDING_FILE_EMPTY_ERROR.getValue()) {
finalErrorMessage = "Error initializing recording custom layouts path \"" finalErrorMessage = "Error initializing recording custom layouts path \""
+ this.openviduConfig().getOpenviduRecordingCustomLayout() + this.openviduConfig().getOpenviduRecordingCustomLayout()
+ "\" set with system property \"openvidu.recording.custom-layout\". Shutting down OpenVidu Server"; + "\" set with system property \"openvidu.recording.custom-layout\"";
} }
log.error(finalErrorMessage); log.error(finalErrorMessage + ". Shutting down OpenVidu Server");
System.exit(1); System.exit(1);
} }
} }

2
openvidu-server/src/main/java/io/openvidu/server/recording/CustomLayoutsHttpHandler.java
View File

@ -34,10 +34,8 @@ public class CustomLayoutsHttpHandler extends WebMvcConfigurerAdapter {
@Override @Override
public void addResourceHandlers(ResourceHandlerRegistry registry) { public void addResourceHandlers(ResourceHandlerRegistry registry) {
String customLayoutsPath = openviduConfig.getOpenviduRecordingCustomLayout(); String customLayoutsPath = openviduConfig.getOpenviduRecordingCustomLayout();
customLayoutsPath = customLayoutsPath.endsWith("/") ? customLayoutsPath : customLayoutsPath + "/"; customLayoutsPath = customLayoutsPath.endsWith("/") ? customLayoutsPath : customLayoutsPath + "/";
openviduConfig.setOpenViduRecordingCustomLayout(customLayoutsPath); openviduConfig.setOpenViduRecordingCustomLayout(customLayoutsPath);
registry.addResourceHandler("/layouts/custom/**").addResourceLocations("file:" + customLayoutsPath); registry.addResourceHandler("/layouts/custom/**").addResourceLocations("file:" + customLayoutsPath);

1
openvidu-server/src/main/java/io/openvidu/server/rest/ConfigRestController.java
View File

@ -86,6 +86,7 @@ public class ConfigRestController {
json.addProperty("openviduRecordingPublicAccess", openviduConfig.getOpenViduRecordingPublicAccess()); json.addProperty("openviduRecordingPublicAccess", openviduConfig.getOpenViduRecordingPublicAccess());
json.addProperty("openviduRecordingNotification", openviduConfig.getOpenViduRecordingNotification()); json.addProperty("openviduRecordingNotification", openviduConfig.getOpenViduRecordingNotification());
json.addProperty("openviduRecordingCustomLayout", openviduConfig.getOpenviduRecordingCustomLayout()); json.addProperty("openviduRecordingCustomLayout", openviduConfig.getOpenviduRecordingCustomLayout());
json.addProperty("openviduRecordingAutostopTimeout", openviduConfig.getOpenviduRecordingAutostopTimeout());
} }
HttpHeaders responseHeaders = new HttpHeaders(); HttpHeaders responseHeaders = new HttpHeaders();