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

openvidu-deployment: Disable coturn logs by default

pull/570/head
cruizba 2020-11-25 19:43:33 +01:00
parent 6dba08afe4
commit 3696c49a9b
5 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openvidu-server/deployments/ce/docker-compose/docker-compose.yml
View File

@ -65,7 +65,7 @@ services:
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
redis:
image: openvidu/openvidu-redis:1.0.0
image: openvidu/openvidu-redis:2.0.0-dev1
restart: always
network_mode: host
environment:
@ -75,7 +75,7 @@ services:
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
coturn:
image: openvidu/openvidu-coturn:2.0.0
image: openvidu/openvidu-coturn:3.0.0-dev1
restart: on-failure
network_mode: host
environment:
@ -85,6 +85,7 @@ services:
- DB_PASSWORD=${OPENVIDU_SECRET}
- MIN_PORT=57001
- MAX_PORT=65535
- ENABLE_COTURN_LOGS=false
logging:
options:
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"

22
openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/beats/filebeat.yml
View File

@ -1,25 +1,3 @@
filebeat.autodiscover:
providers:
- type: docker
hints.enabled: true
templates:
- condition:
contains:
docker.container.name: "nginx"
config:
- module: nginx
access:
input:
type: docker
containers:
ids: "${data.docker.container.id}"
stream: "stdout"
error:
input:
type: docker
containers:
ids: "${data.docker.container.id}"
stream: "stderr"
filebeat.inputs:
- type: container
paths:

5
openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml
View File

@ -52,7 +52,7 @@ services:
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
redis:
image: openvidu/openvidu-redis:1.0.0
image: openvidu/openvidu-redis:2.0.0-dev1
restart: always
network_mode: host
environment:
@ -62,7 +62,7 @@ services:
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"
coturn:
image: openvidu/openvidu-coturn:2.0.0
image: openvidu/openvidu-coturn:3.0.0-dev1
restart: on-failure
network_mode: host
environment:
@ -73,6 +73,7 @@ services:
- MIN_PORT=40000
- MAX_PORT=65535
- TURN_PUBLIC_IP=${TURN_PUBLIC_IP:-auto-ipv4}
- ENABLE_COTURN_LOGS=false
logging:
options:
max-size: "${DOCKER_LOGS_MAX_SIZE:-100M}"

7
openvidu-server/docker/openvidu-coturn/entrypoint.sh
View File

@ -7,6 +7,7 @@ DEBUG=${DEBUG:-false}
#Check parameters
[[ "${TURN_PUBLIC_IP}" == "auto-ipv4" ]] && export TURN_PUBLIC_IP=$(/usr/local/bin/discover_my_public_ip.sh)
[[ "${TURN_PUBLIC_IP}" == "auto-ipv6" ]] && export TURN_PUBLIC_IP=$(/usr/local/bin/discover_my_public_ip.sh --ipv6)
[[ -z "${ENABLE_COTURN_LOGS}" ]] && export ENABLE_COTURN_LOGS=false
echo "TURN public IP: ${TURN_PUBLIC_IP:-"empty"}"
@ -23,4 +24,8 @@ source /tmp/configuration-files.sh
# Remove temp file with configuration parameters
rm /tmp/configuration-files.sh
/usr/bin/turnserver -c /etc/turnserver.conf -v --log-file /dev/null
if [[ "${ENABLE_COTURN_LOGS}" == "true" ]]; then
/usr/bin/turnserver -c /etc/turnserver.conf -v --log-file /dev/null
else
/usr/bin/turnserver -c /etc/turnserver.conf -v --log-file /dev/null --no-stdout-log
fi

6
openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java
View File

@ -4163,7 +4163,11 @@ public class OpenViduTestAppE2eTest extends AbstractOpenViduTestAppE2eTest {
sessionName2.clear();
sessionName2.sendKeys(sessionName);
user.getDriver().findElements(By.className("join-btn")).forEach(el -> el.sendKeys(Keys.ENTER));
List<WebElement> joinButtons = user.getDriver().findElements(By.className("join-btn"));
for(WebElement el : joinButtons) {
Thread.sleep(5000);
el.sendKeys(Keys.ENTER);
}
user.getEventManager().waitUntilEventReaches("connectionCreated", 4);
user.getEventManager().waitUntilEventReaches("accessAllowed", 2);