diff --git a/openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java b/openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java index cf544f24..63a70647 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java +++ b/openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java @@ -244,13 +244,13 @@ public class OpenViduServer implements JsonRpcConfigurer { } else if (e.getCodeValue() == Code.RECORDING_PATH_NOT_VALID.getValue()) { finalErrorMessage = "Error initializing recording path \"" + 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()) { finalErrorMessage = "Error initializing recording custom layouts path \"" + 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); } } diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/CustomLayoutsHttpHandler.java b/openvidu-server/src/main/java/io/openvidu/server/recording/CustomLayoutsHttpHandler.java index 9aa524ce..3068224e 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/recording/CustomLayoutsHttpHandler.java +++ b/openvidu-server/src/main/java/io/openvidu/server/recording/CustomLayoutsHttpHandler.java @@ -34,10 +34,8 @@ public class CustomLayoutsHttpHandler extends WebMvcConfigurerAdapter { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { - String customLayoutsPath = openviduConfig.getOpenviduRecordingCustomLayout(); customLayoutsPath = customLayoutsPath.endsWith("/") ? customLayoutsPath : customLayoutsPath + "/"; - openviduConfig.setOpenViduRecordingCustomLayout(customLayoutsPath); registry.addResourceHandler("/layouts/custom/**").addResourceLocations("file:" + customLayoutsPath); diff --git a/openvidu-server/src/main/java/io/openvidu/server/rest/ConfigRestController.java b/openvidu-server/src/main/java/io/openvidu/server/rest/ConfigRestController.java index c04cf2ae..eb42c3f5 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/rest/ConfigRestController.java +++ b/openvidu-server/src/main/java/io/openvidu/server/rest/ConfigRestController.java @@ -86,6 +86,7 @@ public class ConfigRestController { json.addProperty("openviduRecordingPublicAccess", openviduConfig.getOpenViduRecordingPublicAccess()); json.addProperty("openviduRecordingNotification", openviduConfig.getOpenViduRecordingNotification()); json.addProperty("openviduRecordingCustomLayout", openviduConfig.getOpenviduRecordingCustomLayout()); + json.addProperty("openviduRecordingAutostopTimeout", openviduConfig.getOpenviduRecordingAutostopTimeout()); } HttpHeaders responseHeaders = new HttpHeaders();