Updated META-INF and dotenv.path property position

pull/431/head
pabloFuente 2020-04-11 01:49:54 +02:00
parent 69f28ce7a4
commit 675de73351
3 changed files with 232 additions and 230 deletions

View File

@ -333,12 +333,12 @@ public class KurentoParticipant extends Participant {
} }
} else { } else {
log.error( log.error(
"Timeout waiting for PublisherEndpoint closing lock of participant {} to be available for participant {} to call cancelReceveivingMedia", "Timeout waiting for PublisherEndpoint closing lock of participant {} to be available for participant {} to call cancelReceivingMedia",
senderName, this.getParticipantPublicId()); senderName, this.getParticipantPublicId());
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
log.error( log.error(
"InterruptedException while waiting for PublisherEndpoint closing lock of participant {} to be available for participant {} to call cancelReceveivingMedia", "InterruptedException while waiting for PublisherEndpoint closing lock of participant {} to be available for participant {} to call cancelReceivingMedia",
senderName, this.getParticipantPublicId()); senderName, this.getParticipantPublicId());
} finally { } finally {
// Always clean map // Always clean map

View File

@ -1,226 +1,228 @@
{"properties": [ {
{ "properties": [
"name": "kms.uris", {
"type": "java.lang.String", "name": "dotenv.path",
"description": "KMS URL's to which OpenVidu Server will try to connect. They are tested in order until a valid one is found", "type": "java.lang.String",
"defaultValue": "[\"ws://localhost:8888/kurento\"]" "description": "Path to the .env configuration file"
}, },
{ {
"name": "openvidu.secret", "name": "kms.uris",
"type": "java.lang.String", "type": "java.lang.String",
"description": "Secret used to connect to OpenVidu Server. This value is required when using the REST API or any server client, as well as when connecting to openvidu-server dashboard", "description": "KMS URL's to which OpenVidu Server will try to connect. They are tested in order until a valid one is found",
"defaultValue": "MY_SECRET" "defaultValue": "[\"ws://localhost:8888/kurento\"]"
}, },
{ {
"name": "openvidu.publicurl", "name": "openvidu.secret",
"type": "java.lang.String", "type": "java.lang.String",
"description": "URL to connect clients to OpenVidu Server. This must be the full IP of your OpenVidu Server, including protocol, host and port (for example: https://my.openvidu.server.ip:4443). If no port argument is provided, 'server.port' param will be appended to it", "description": "Secret used to connect to OpenVidu Server. This value is required when using the REST API or any server client, as well as when connecting to openvidu-server dashboard",
"defaultValue": "local" "defaultValue": "MY_SECRET"
}, },
{ {
"name": "openvidu.cdr", "name": "openvidu.publicurl",
"type": "java.lang.Boolean", "type": "java.lang.String",
"description": "Whether to enable Call Detail Record or not", "description": "URL to connect clients to OpenVidu Server. This must be the full IP of your OpenVidu Server, including protocol, host and port (for example: https://my.openvidu.server.ip:4443). If no port argument is provided, 'server.port' param will be appended to it",
"defaultValue": false "defaultValue": "local"
}, },
{ {
"name": "openvidu.cdr.path", "name": "openvidu.cdr",
"type": "java.lang.String", "type": "java.lang.Boolean",
"description": "Where to store CDR files", "description": "Whether to enable Call Detail Record or not",
"defaultValue": "log" "defaultValue": false
}, },
{ {
"name": "openvidu.recording", "name": "openvidu.cdr.path",
"type": "java.lang.Boolean", "type": "java.lang.String",
"description": "Whether to start OpenVidu Server with recording module service available or not (a Docker image will be downloaded during the first execution). Apart from setting this param to true, it is also necessary to explicitly configure sessions to be recorded", "description": "Where to store CDR files",
"defaultValue": false "defaultValue": "log"
}, },
{ {
"name": "openvidu.recording.path", "name": "openvidu.recording",
"type": "java.lang.String", "type": "java.lang.Boolean",
"description": "Where to store the recorded video files", "description": "Whether to start OpenVidu Server with recording module service available or not (a Docker image will be downloaded during the first execution). Apart from setting this param to true, it is also necessary to explicitly configure sessions to be recorded",
"defaultValue": "/opt/openvidu/recordings" "defaultValue": false
}, },
{ {
"name": "openvidu.recording.public-access", "name": "openvidu.recording.path",
"type": "java.lang.Boolean", "type": "java.lang.String",
"description": "'true' to allow public access to the video files specified in 'openviu.recording.path'. 'false' to only allow access to authenticated users", "description": "Where to store the recorded video files",
"defaultValue": false "defaultValue": "/opt/openvidu/recordings"
}, },
{ {
"name": "openvidu.recording.notification", "name": "openvidu.recording.public-access",
"type": "java.lang.String", "type": "java.lang.Boolean",
"description": "Which users will receive a notfication (client events 'recordingStarted' and 'recordingStopped') when recording starts and stops: 'none', 'publisher_moderator', 'all'", "description": "'true' to allow public access to the video files specified in 'openviu.recording.path'. 'false' to only allow access to authenticated users",
"defaultValue": "publisher_moderator" "defaultValue": false
}, },
{ {
"name": "openvidu.recording.custom-layout", "name": "openvidu.recording.notification",
"type": "java.lang.String", "type": "java.lang.String",
"description": "Where should OpenVidu Server look for custom recording layouts", "description": "Which users will receive a notfication (client events 'recordingStarted' and 'recordingStopped') when recording starts and stops: 'none', 'publisher_moderator', 'all'",
"defaultValue": "/opt/openvidu/custom-layout" "defaultValue": "publisher_moderator"
}, },
{ {
"name": "openvidu.recording.version", "name": "openvidu.recording.custom-layout",
"type": "java.lang.String", "type": "java.lang.String",
"description": "Tag for openvidu/openvidu-recording Docker image" "description": "Where should OpenVidu Server look for custom recording layouts",
}, "defaultValue": "/opt/openvidu/custom-layout"
{ },
"name": "openvidu.recording.autostop-timeout", {
"type": "java.lang.Integer", "name": "openvidu.recording.version",
"description": "Timeout in seconds for automatically stopping the recording of a session when last user disconnects or when it starts and no user is publishing (only if RecordingMode.MANUAL)", "type": "java.lang.String",
"defaultValue": 120 "description": "Tag for openvidu/openvidu-recording Docker image"
}, },
{ {
"name": "openvidu.recording.composed-url", "name": "openvidu.recording.autostop-timeout",
"type": "java.lang.String", "type": "java.lang.Integer",
"description": "URL the composed-video recording dockerized Chrome will use to connect to the recording layouts inside OpenVidu Server host. This will affect all video recording layouts (default one BEST_FIT, all CUSTOM layouts). This allows changing the default URL, which is 'openvidu.publicurl', for those cases where OpenVidu Server host does not allow back and forth connections using the public url from inside the host", "description": "Timeout in seconds for automatically stopping the recording of a session when last user disconnects or when it starts and no user is publishing (only if RecordingMode.MANUAL)",
"defaultValue": "" "defaultValue": 120
}, },
{ {
"name": "openvidu.webhook", "name": "openvidu.recording.composed-url",
"type": "java.lang.Boolean", "type": "java.lang.String",
"description": "'true' to enable OpenVidu Server Webhook service. 'false' otherwise", "description": "URL the composed-video recording dockerized Chrome will use to connect to the recording layouts inside OpenVidu Server host. This will affect all video recording layouts (default one BEST_FIT, all CUSTOM layouts). This allows changing the default URL, which is 'openvidu.publicurl', for those cases where OpenVidu Server host does not allow back and forth connections using the public url from inside the host",
"defaultValue": false "defaultValue": ""
}, },
{ {
"name": "openvidu.webhook.endpoint", "name": "openvidu.webhook",
"type": "java.lang.String", "type": "java.lang.Boolean",
"description": "HTTP endpoint where OpenVidu Server will send Webhook HTTP POST messages", "description": "'true' to enable OpenVidu Server Webhook service. 'false' otherwise",
"defaultValue": "" "defaultValue": false
}, },
{ {
"name": "openvidu.webhook.headers", "name": "openvidu.webhook.endpoint",
"type": "java.lang.String", "type": "java.lang.String",
"description": "List of headers that OpenVidu Server Webhook service will attach to HTTP POST messages", "description": "HTTP endpoint where OpenVidu Server will send Webhook HTTP POST messages",
"defaultValue": "[]" "defaultValue": ""
}, },
{ {
"name": "openvidu.webhook.events", "name": "openvidu.webhook.headers",
"type": "java.lang.String", "type": "java.lang.String",
"description": "List of events that will be sent by OpenVidu Server Webhook service", "description": "List of headers that OpenVidu Server Webhook service will attach to HTTP POST messages",
"defaultValue": "[\"sessionCreated\",\"sessionDestroyed\",\"participantJoined\",\"participantLeft\",\"webrtcConnectionCreated\",\"webrtcConnectionDestroyed\",\"recordingStatusChanged\"]" "defaultValue": "[]"
}, },
{ {
"name": "openvidu.streams.video.max-recv-bandwidth", "name": "openvidu.webhook.events",
"type": "java.lang.Integer", "type": "java.lang.String",
"description": "Maximum video bandwidth sent from clients to OpenVidu Server, in kbps. 0 means unconstrained", "description": "List of events that will be sent by OpenVidu Server Webhook service",
"defaultValue": 1000 "defaultValue": "[\"sessionCreated\",\"sessionDestroyed\",\"participantJoined\",\"participantLeft\",\"webrtcConnectionCreated\",\"webrtcConnectionDestroyed\",\"recordingStatusChanged\"]"
}, },
{ {
"name": "openvidu.streams.video.min-recv-bandwidth", "name": "openvidu.streams.video.max-recv-bandwidth",
"type": "java.lang.Integer", "type": "java.lang.Integer",
"description": "Minimum video bandwidth sent from clients to OpenVidu Server, in kbps. 0 means unconstrained", "description": "Maximum video bandwidth sent from clients to OpenVidu Server, in kbps. 0 means unconstrained",
"defaultValue": 300 "defaultValue": 1000
}, },
{ {
"name": "openvidu.streams.video.max-send-bandwidth", "name": "openvidu.streams.video.min-recv-bandwidth",
"type": "java.lang.Integer", "type": "java.lang.Integer",
"description": "Maximum video bandwidth sent from OpenVidu Server to clients, in kbps. 0 means unconstrained", "description": "Minimum video bandwidth sent from clients to OpenVidu Server, in kbps. 0 means unconstrained",
"defaultValue": 1000 "defaultValue": 300
}, },
{ {
"name": "openvidu.streams.video.min-send-bandwidth", "name": "openvidu.streams.video.max-send-bandwidth",
"type": "java.lang.Integer", "type": "java.lang.Integer",
"description": "Minimum video bandwidth sent from OpenVidu Server to clients, in kbps. 0 means unconstrained", "description": "Maximum video bandwidth sent from OpenVidu Server to clients, in kbps. 0 means unconstrained",
"defaultValue": 300 "defaultValue": 1000
}, },
{ {
"name": "openvidu.sessions.garbage.interval", "name": "openvidu.streams.video.min-send-bandwidth",
"type": "java.lang.Integer", "type": "java.lang.Integer",
"description": "How often the garbage collector of non active sessions runs. This helps cleaning up sessions that have been initialized through REST API (and maybe tokens have been created for them) but have had no users connected. Default to 900s (15 mins). 0 to disable non active sessions garbage collector", "description": "Minimum video bandwidth sent from OpenVidu Server to clients, in kbps. 0 means unconstrained",
"defaultValue": 900 "defaultValue": 300
}, },
{ {
"name": "openvidu.sessions.garbage.threshold", "name": "openvidu.sessions.garbage.interval",
"type": "java.lang.Integer", "type": "java.lang.Integer",
"description": "Minimum time in seconds that a non active session must have been in existence for the garbage collector of non active sessions to remove it. Default to 3600s (1 hour). If non active sessions garbage collector is disabled (property 'openvidu.sessions.garbage.interval' to 0) this property is ignored", "description": "How often the garbage collector of non active sessions runs. This helps cleaning up sessions that have been initialized through REST API (and maybe tokens have been created for them) but have had no users connected. Default to 900s (15 mins). 0 to disable non active sessions garbage collector",
"defaultValue": 3600 "defaultValue": 900
}, },
{ {
"name": "coturn.ip", "name": "openvidu.sessions.garbage.threshold",
"type": "java.lang.String", "type": "java.lang.Integer",
"description": "Coturn IP of a deployed coturn server" "description": "Minimum time in seconds that a non active session must have been in existence for the garbage collector of non active sessions to remove it. Default to 3600s (1 hour). If non active sessions garbage collector is disabled (property 'openvidu.sessions.garbage.interval' to 0) this property is ignored",
}, "defaultValue": 3600
{ },
"name": "coturn.redis.ip", {
"type": "java.lang.String", "name": "coturn.ip",
"description": "Redis IP where OpenVidu Server should connect to store TURN credentials", "type": "java.lang.String",
"defaultValue": "127.0.0.1" "description": "Coturn IP of a deployed coturn server"
}, },
{ {
"name": "coturn.redis.dbname", "name": "coturn.redis.ip",
"type": "java.lang.String", "type": "java.lang.String",
"description": "Redis database where to store TURN credentials", "description": "Redis IP where OpenVidu Server should connect to store TURN credentials",
"defaultValue": "0" "defaultValue": "127.0.0.1"
}, },
{ {
"name": "coturn.redis.password", "name": "coturn.redis.dbname",
"type": "java.lang.String", "type": "java.lang.String",
"description": "Password to connect OpenVidu Server to Redis database to store TURN credentials", "description": "Redis database where to store TURN credentials",
"defaultValue": "turn" "defaultValue": "0"
}, },
{ {
"name": "coturn.redis.connect-timeout", "name": "coturn.redis.password",
"type": "java.lang.Integer", "type": "java.lang.String",
"description": "Timeout in seconds when OpenVidu Server is connecting to Redis database to store TURN credentials", "description": "Password to connect OpenVidu Server to Redis database to store TURN credentials",
"defaultValue": 30 "defaultValue": "turn"
}, },
{ {
"name": "coturn.sqlite", "name": "coturn.redis.connect-timeout",
"type": "java.lang.String", "type": "java.lang.Integer",
"description": "Path to COTURN sqlite database to add and remove TURN user credentials", "description": "Timeout in seconds when OpenVidu Server is connecting to Redis database to store TURN credentials",
"defaultValue": "/opt/openvidu/coturn/turndb" "defaultValue": 30
}, },
{ {
"name": "jsonRpcClientWebSocket.reconnectionDelay", "name": "coturn.sqlite",
"type": "java.lang.Integer", "type": "java.lang.String",
"description": "Reconnection delay when Kurento Media Server connection is lost (ms)", "description": "Path to COTURN sqlite database to add and remove TURN user credentials",
"defaultValue": 2000 "defaultValue": "/opt/openvidu/coturn/turndb"
}, },
{ {
"name": "jsonRpcClientWebSocket.timeout", "name": "jsonRpcClientWebSocket.reconnectionDelay",
"type": "java.lang.Integer", "type": "java.lang.Integer",
"description": "Timeout for RPC operations sent to KMS through websocket (ms)", "description": "Reconnection delay when Kurento Media Server connection is lost (ms)",
"defaultValue": 60000 "defaultValue": 2000
}, },
{ {
"name": "jsonRpcClientWebSocket.packetSize", "name": "jsonRpcClientWebSocket.timeout",
"type": "java.lang.Integer", "type": "java.lang.Integer",
"description": "Maximum size of packets sent through websocket", "description": "Timeout for RPC operations sent to KMS through websocket (ms)",
"defaultValue": 1000000 "defaultValue": 60000
}, },
{ {
"name": "jsonRpcClientWebSocket.connectionTimeout", "name": "jsonRpcClientWebSocket.packetSize",
"type": "java.lang.Integer", "type": "java.lang.Integer",
"description": "Timeout for openvidu-server to connect through websocket to KMS (ms)", "description": "Maximum size of packets sent through websocket",
"defaultValue": 5000 "defaultValue": 1000000
}, },
{ {
"name": "kurento.client.keepAliveTime", "name": "jsonRpcClientWebSocket.connectionTimeout",
"type": "java.lang.Integer", "type": "java.lang.Integer",
"description": "Heartbeat frecuency between openvidu-server and KMS (ms)", "description": "Timeout for openvidu-server to connect through websocket to KMS (ms)",
"defaultValue": 240000 "defaultValue": 5000
}, },
{ {
"name": "ws.sessionReconnectionTime", "name": "kurento.client.keepAliveTime",
"type": "java.lang.Integer", "type": "java.lang.Integer",
"description": "Reconnection timeout between clients and openvidu-server (seconds)", "description": "Heartbeat frecuency between openvidu-server and KMS (ms)",
"defaultValue": 10 "defaultValue": 240000
}, },
{ {
"name": "ws.maxSessions", "name": "ws.sessionReconnectionTime",
"type": "java.lang.Long", "type": "java.lang.Integer",
"description": "Maximum number of websocket sessions that openvidu-server will be able to hold", "description": "Reconnection timeout between clients and openvidu-server (seconds)",
"defaultValue": 9223372036854775807 "defaultValue": 10
}, },
{ {
"name": "certificate.type", "name": "ws.maxSessions",
"type": "java.lang.String", "type": "java.lang.Long",
"description": "A description for 'certificate.type'" "description": "Maximum number of websocket sessions that openvidu-server will be able to hold",
}, "defaultValue": 9223372036854775807
{ },
"name": "dotenvpath", {
"type": "java.lang.String", "name": "certificate.type",
"description": "A description for 'dotenvpath'" "type": "java.lang.String",
} "description": "A description for 'certificate.type'"
]} }
]
}

View File

@ -1,3 +1,5 @@
dotenv.path=.
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
@ -44,5 +46,3 @@ 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
dotenv.path=.