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

openvidu-server: application.properties refactoring

pull/375/head
pabloFuente 2019-07-05 15:00:06 +02:00
parent 89432c52a9
commit bd036fc419
2 changed files with 46 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,7 @@ import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.support.PropertiesLoaderUtils; import org.springframework.core.io.support.PropertiesLoaderUtils;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.google.gson.Gson;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
@ -171,7 +172,7 @@ public class OpenviduConfig {
} }
try { try {
this.initiateKmsUris(); this.initiateKmsUris(this.kmsUris);
} catch (Exception e) { } catch (Exception e) {
log.error("Error in 'kms.uris' system property: " + e.getMessage()); log.error("Error in 'kms.uris' system property: " + e.getMessage());
log.error("Shutting down OpenVidu Server"); log.error("Shutting down OpenVidu Server");
@ -383,14 +384,16 @@ public class OpenviduConfig {
return this.externalizedProperties; return this.externalizedProperties;
} }
private void initiateKmsUris() throws Exception { private void initiateKmsUris(String kmsUris) throws Exception {
if (kmsUrisList == null) { kmsUris = kmsUris.replaceAll("\\s", ""); // Remove all white spaces
this.kmsUris = this.kmsUris.replaceAll("\\s", ""); kmsUris = kmsUris.replaceAll("\\\\", ""); // Remove previous escapes
JsonParser parser = new JsonParser(); kmsUris = kmsUris.replaceAll("\"", ""); // Remove previous double quotes
JsonElement elem = parser.parse(this.kmsUris); kmsUris = kmsUris.replaceFirst("^\\[", "[\\\""); // Escape first char
JsonArray kmsUris = elem.getAsJsonArray(); kmsUris = kmsUris.replaceFirst("\\]$", "\\\"]"); // Escape last char
this.kmsUrisList = JsonUtils.toStringList(kmsUris); kmsUris = kmsUris.replaceAll(",", "\\\",\\\""); // Escape middle uris
} Gson gson = new Gson();
JsonArray kmsUrisArray = gson.fromJson(kmsUris, JsonArray.class);
this.kmsUrisList = JsonUtils.toStringList(kmsUrisArray);
} }
public void initiateOpenViduWebhookEndpoint(String endpoint) throws Exception { public void initiateOpenViduWebhookEndpoint(String endpoint) throws Exception {

68
openvidu-server/src/main/resources/application.properties
View File

@ -1,42 +1,42 @@
server.address: 0.0.0.0 server.address=0.0.0.0
server.ssl.enabled: true server.ssl.enabled=true
server.port: 4443 server.port=4443
server.ssl.key-store: classpath:openvidu-selfsigned.jks server.ssl.key-store=classpath:openvidu-selfsigned.jks
server.ssl.key-store-password: openvidu server.ssl.key-store-password=openvidu
server.ssl.key-store-type: JKS server.ssl.key-store-type=JKS
server.ssl.key-alias: openvidu-selfsigned server.ssl.key-alias=openvidu-selfsigned
logging.level.root: info logging.level.root=info
spring.main.allow-bean-definition-overriding: true spring.main.allow-bean-definition-overriding=true
kms.uris: [\"ws://localhost:8888/kurento\"] kms.uris=["ws://localhost:8888/kurento"]
openvidu.publicurl: local openvidu.publicurl=local
openvidu.secret: MY_SECRET openvidu.secret=MY_SECRET
openvidu.cdr: false openvidu.cdr=false
openvidu.cdr.path: log openvidu.cdr.path=log
openvidu.webhook: false openvidu.webhook=false
openvidu.webhook.endpoint: openvidu.webhook.endpoint=
openvidu.webhook.headers: [] openvidu.webhook.headers=[]
openvidu.webhook.events: [\"sessionCreated\",\"sessionDestroyed\",\"participantJoined\",\"participantLeft\",\"webrtcConnectionCreated\",\"webrtcConnectionDestroyed\",\"recordingStatusChanged\"] openvidu.webhook.events=["sessionCreated","sessionDestroyed","participantJoined","participantLeft","webrtcConnectionCreated","webrtcConnectionDestroyed","recordingStatusChanged"]
openvidu.recording: false openvidu.recording=false
openvidu.recording.version: 2.9.0 openvidu.recording.version=2.9.0
openvidu.recording.path: /opt/openvidu/recordings openvidu.recording.path=/opt/openvidu/recordings
openvidu.recording.public-access: false openvidu.recording.public-access=false
openvidu.recording.notification: publisher_moderator openvidu.recording.notification=publisher_moderator
openvidu.recording.custom-layout: /opt/openvidu/custom-layout openvidu.recording.custom-layout=/opt/openvidu/custom-layout
openvidu.recording.autostop-timeout: 120 openvidu.recording.autostop-timeout=120
openvidu.recording.composed-url: openvidu.recording.composed-url=
openvidu.streams.video.max-recv-bandwidth: 1000 openvidu.streams.video.max-recv-bandwidth=1000
openvidu.streams.video.min-recv-bandwidth: 300 openvidu.streams.video.min-recv-bandwidth=300
openvidu.streams.video.max-send-bandwidth: 1000 openvidu.streams.video.max-send-bandwidth=1000
openvidu.streams.video.min-send-bandwidth: 300 openvidu.streams.video.min-send-bandwidth=300
coturn.redis.ip: 127.0.0.1 coturn.redis.ip=127.0.0.1
coturn.redis.dbname: 0 coturn.redis.dbname=0
coturn.redis.password: turn coturn.redis.password=turn
coturn.redis.connect-timeout: 30 coturn.redis.connect-timeout=30