From bd036fc4197fd5116f5990c95ed7496836b184bb Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Fri, 5 Jul 2019 15:00:06 +0200 Subject: [PATCH] openvidu-server: application.properties refactoring --- .../server/config/OpenviduConfig.java | 21 +++--- .../src/main/resources/application.properties | 68 +++++++++---------- 2 files changed, 46 insertions(+), 43 deletions(-) diff --git a/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java b/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java index 47beba1b..909fbccc 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java +++ b/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java @@ -40,6 +40,7 @@ import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.support.PropertiesLoaderUtils; import org.springframework.stereotype.Component; +import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonParser; @@ -171,7 +172,7 @@ public class OpenviduConfig { } try { - this.initiateKmsUris(); + this.initiateKmsUris(this.kmsUris); } catch (Exception e) { log.error("Error in 'kms.uris' system property: " + e.getMessage()); log.error("Shutting down OpenVidu Server"); @@ -383,14 +384,16 @@ public class OpenviduConfig { return this.externalizedProperties; } - private void initiateKmsUris() throws Exception { - if (kmsUrisList == null) { - this.kmsUris = this.kmsUris.replaceAll("\\s", ""); - JsonParser parser = new JsonParser(); - JsonElement elem = parser.parse(this.kmsUris); - JsonArray kmsUris = elem.getAsJsonArray(); - this.kmsUrisList = JsonUtils.toStringList(kmsUris); - } + private void initiateKmsUris(String kmsUris) throws Exception { + kmsUris = kmsUris.replaceAll("\\s", ""); // Remove all white spaces + kmsUris = kmsUris.replaceAll("\\\\", ""); // Remove previous escapes + kmsUris = kmsUris.replaceAll("\"", ""); // Remove previous double quotes + kmsUris = kmsUris.replaceFirst("^\\[", "[\\\""); // Escape first char + kmsUris = kmsUris.replaceFirst("\\]$", "\\\"]"); // Escape last char + 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 { diff --git a/openvidu-server/src/main/resources/application.properties b/openvidu-server/src/main/resources/application.properties index 2436ab0b..92e1c886 100644 --- a/openvidu-server/src/main/resources/application.properties +++ b/openvidu-server/src/main/resources/application.properties @@ -1,42 +1,42 @@ -server.address: 0.0.0.0 -server.ssl.enabled: true -server.port: 4443 -server.ssl.key-store: classpath:openvidu-selfsigned.jks -server.ssl.key-store-password: openvidu -server.ssl.key-store-type: JKS -server.ssl.key-alias: openvidu-selfsigned +server.address=0.0.0.0 +server.ssl.enabled=true +server.port=4443 +server.ssl.key-store=classpath:openvidu-selfsigned.jks +server.ssl.key-store-password=openvidu +server.ssl.key-store-type=JKS +server.ssl.key-alias=openvidu-selfsigned -logging.level.root: info -spring.main.allow-bean-definition-overriding: true +logging.level.root=info +spring.main.allow-bean-definition-overriding=true -kms.uris: [\"ws://localhost:8888/kurento\"] +kms.uris=["ws://localhost:8888/kurento"] -openvidu.publicurl: local -openvidu.secret: MY_SECRET +openvidu.publicurl=local +openvidu.secret=MY_SECRET -openvidu.cdr: false -openvidu.cdr.path: log +openvidu.cdr=false +openvidu.cdr.path=log -openvidu.webhook: false -openvidu.webhook.endpoint: -openvidu.webhook.headers: [] -openvidu.webhook.events: [\"sessionCreated\",\"sessionDestroyed\",\"participantJoined\",\"participantLeft\",\"webrtcConnectionCreated\",\"webrtcConnectionDestroyed\",\"recordingStatusChanged\"] +openvidu.webhook=false +openvidu.webhook.endpoint= +openvidu.webhook.headers=[] +openvidu.webhook.events=["sessionCreated","sessionDestroyed","participantJoined","participantLeft","webrtcConnectionCreated","webrtcConnectionDestroyed","recordingStatusChanged"] -openvidu.recording: false -openvidu.recording.version: 2.9.0 -openvidu.recording.path: /opt/openvidu/recordings -openvidu.recording.public-access: false -openvidu.recording.notification: publisher_moderator -openvidu.recording.custom-layout: /opt/openvidu/custom-layout -openvidu.recording.autostop-timeout: 120 -openvidu.recording.composed-url: +openvidu.recording=false +openvidu.recording.version=2.9.0 +openvidu.recording.path=/opt/openvidu/recordings +openvidu.recording.public-access=false +openvidu.recording.notification=publisher_moderator +openvidu.recording.custom-layout=/opt/openvidu/custom-layout +openvidu.recording.autostop-timeout=120 +openvidu.recording.composed-url= -openvidu.streams.video.max-recv-bandwidth: 1000 -openvidu.streams.video.min-recv-bandwidth: 300 -openvidu.streams.video.max-send-bandwidth: 1000 -openvidu.streams.video.min-send-bandwidth: 300 +openvidu.streams.video.max-recv-bandwidth=1000 +openvidu.streams.video.min-recv-bandwidth=300 +openvidu.streams.video.max-send-bandwidth=1000 +openvidu.streams.video.min-send-bandwidth=300 -coturn.redis.ip: 127.0.0.1 -coturn.redis.dbname: 0 -coturn.redis.password: turn -coturn.redis.connect-timeout: 30 +coturn.redis.ip=127.0.0.1 +coturn.redis.dbname=0 +coturn.redis.password=turn +coturn.redis.connect-timeout=30