From b02ed1aac04272bb2fc9633517f1b83f57574de9 Mon Sep 17 00:00:00 2001 From: cruizba Date: Tue, 24 Nov 2020 23:27:48 +0100 Subject: [PATCH] openvidu-deployment: Start CF deployment whith openvidu script instead of docker-compose up -d --- .../aws/cfn-openvidu-server-pro-no-market.yaml.template | 3 ++- .../pro/docker-compose/openvidu-server-pro/openvidu | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/openvidu-server/deployments/pro/aws/cfn-openvidu-server-pro-no-market.yaml.template b/openvidu-server/deployments/pro/aws/cfn-openvidu-server-pro-no-market.yaml.template index 57d1a321..5c5379cb 100644 --- a/openvidu-server/deployments/pro/aws/cfn-openvidu-server-pro-no-market.yaml.template +++ b/openvidu-server/deployments/pro/aws/cfn-openvidu-server-pro-no-market.yaml.template @@ -656,7 +656,8 @@ Resources: # Start openvidu application pushd /opt/openvidu - docker-compose up -d + export FOLLOW_OPENVIDU_LOGS=false + /bin/bash openvidu start popd # Wait for the app diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu index be106f4f..49f619e0 100755 --- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu +++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu @@ -227,12 +227,15 @@ usage() { printf "\n" } +# Follow openvidu logs by default +[ -z "${FOLLOW_OPENVIDU_LOGS}" ] && export FOLLOW_OPENVIDU_LOGS=true + case $1 in start) docker-compose up -d stop_elk_if_external - docker-compose logs -f openvidu-server + [[ "${FOLLOW_OPENVIDU_LOGS}" == "true" ]] && docker-compose logs -f openvidu-server ;; stop) @@ -243,7 +246,7 @@ case $1 in docker-compose down docker-compose up -d stop_elk_if_external - docker-compose logs -f openvidu-server + [[ "${FOLLOW_OPENVIDU_LOGS}" == "true" ]] && docker-compose logs -f openvidu-server ;; logs)