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

openvidu-server: updated config GET response. Version in variable

pull/203/head
pabloFuente 2019-01-25 12:30:01 +01:00
parent ff9dec285b
commit 813bf1613b
3 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
openvidu-server/pom.xml
View File

@ -12,7 +12,7 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OpenVidu Server</name> <name>OpenVidu Server</name>
<version>2.7.0</version> <version>${version.openvidu.server}</version>
<description>OpenVidu Server</description> <description>OpenVidu Server</description>
<url>https://github.com/OpenVidu/openvidu</url> <url>https://github.com/OpenVidu/openvidu</url>
@ -48,6 +48,7 @@
<properties> <properties>
<!-- Main class --> <!-- Main class -->
<start-class>io.openvidu.server.OpenViduServer</start-class> <start-class>io.openvidu.server.OpenViduServer</start-class>
<version.openvidu.server>2.7.0</version.openvidu.server>
</properties> </properties>
<profiles> <profiles>
@ -83,15 +84,15 @@
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>build-info</id>
<goals> <goals>
<goal>build-info</goal> <goal>build-info</goal>
</goals>
</execution>
<execution>
<goals>
<goal>repackage</goal> <goal>repackage</goal>
</goals> </goals>
<configuration>
<additionalProperties>
<version.openvidu.server>${version.openvidu.server}</version.openvidu.server>
</additionalProperties>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
@ -143,15 +144,15 @@
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>build-info</id>
<goals> <goals>
<goal>build-info</goal> <goal>build-info</goal>
</goals>
</execution>
<execution>
<goals>
<goal>repackage</goal> <goal>repackage</goal>
</goals> </goals>
<configuration>
<additionalProperties>
<version.openvidu.server>${version.openvidu.server}</version.openvidu.server>
</additionalProperties>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>

12
openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java
View File

@ -95,10 +95,6 @@ public class OpenviduConfig {
private String finalUrl; private String finalUrl;
public String getOpenViduServerVersion() {
return this.buildProperties.getVersion();
}
public String getOpenViduPublicUrl() { public String getOpenViduPublicUrl() {
return this.openviduPublicUrl; return this.openviduPublicUrl;
} }
@ -218,4 +214,12 @@ public class OpenviduConfig {
return roles; return roles;
} }
public String getOpenViduServerVersion() {
return this.buildProperties.get("version.openvidu.server");
}
public String getVersion() {
return this.buildProperties.getVersion();
}
} }

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

@ -69,16 +69,25 @@ public class ConfigRestController {
} }
@RequestMapping(method = RequestMethod.GET) @RequestMapping(method = RequestMethod.GET)
public ResponseEntity<?> getOpenViduConfiguration() { public ResponseEntity<String> getOpenViduConfiguration() {
JsonObject json = new JsonObject(); JsonObject json = new JsonObject();
json.addProperty("openviduServerVersion", openviduConfig.getOpenViduServerVersion()); json.addProperty("openviduServerVersion", openviduConfig.getOpenViduServerVersion());
json.addProperty("artifactVersion", openviduConfig.getVersion());
json.addProperty("openviduPublicurl", openviduConfig.getOpenViduPublicUrl()); json.addProperty("openviduPublicurl", openviduConfig.getOpenViduPublicUrl());
json.addProperty("openviduCdr", openviduConfig.isCdrEnabled()); json.addProperty("openviduCdr", openviduConfig.isCdrEnabled());
json.addProperty("maxRecvBandwidth", openviduConfig.getVideoMaxRecvBandwidth());
json.addProperty("minRecvBandwidth", openviduConfig.getVideoMinRecvBandwidth());
json.addProperty("maxSendBandwidth", openviduConfig.getVideoMaxSendBandwidth());
json.addProperty("minSendBandwidth", openviduConfig.getVideoMinSendBandwidth());
json.addProperty("openviduRecording", openviduConfig.isRecordingModuleEnabled()); json.addProperty("openviduRecording", openviduConfig.isRecordingModuleEnabled());
json.addProperty("openviduRecordingPublicAccess", openviduConfig.getOpenViduRecordingPublicAccess()); if (openviduConfig.isRecordingModuleEnabled()) {
json.addProperty("openviduRecordingPath", openviduConfig.getOpenViduRecordingPath()); json.addProperty("openviduRecordingVersion", openviduConfig.getOpenViduRecordingVersion());
json.addProperty("openviduRecordingVersion", openviduConfig.getOpenViduRecordingVersion()); json.addProperty("openviduRecordingPath", openviduConfig.getOpenViduRecordingPath());
json.addProperty("openviduRecordingPublicAccess", openviduConfig.getOpenViduRecordingPublicAccess());
json.addProperty("openviduRecordingNotification", openviduConfig.getOpenViduRecordingNotification());
json.addProperty("openviduRecordingCustomLayout", openviduConfig.getOpenviduRecordingCustomLayout());
}
HttpHeaders responseHeaders = new HttpHeaders(); HttpHeaders responseHeaders = new HttpHeaders();
responseHeaders.setContentType(MediaType.APPLICATION_JSON); responseHeaders.setContentType(MediaType.APPLICATION_JSON);