From da617a8537a702e63767518a57422ede9f993652 Mon Sep 17 00:00:00 2001
From: cruizba <charlesrb94@outlook.com>
Date: Thu, 26 Nov 2020 13:45:51 +0100
Subject: [PATCH] openvidu-deployment: Run openvidu in CF using openvidu script

---
 .../cfn-openvidu-server-pro-no-market.yaml.template  | 12 ++++--------
 .../pro/docker-compose/openvidu-server-pro/openvidu  |  6 ++++--
 2 files changed, 8 insertions(+), 10 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 372b363d..3c39fdf1 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
@@ -615,7 +615,8 @@ Resources:
 
                 # Restart all services
                 pushd /opt/openvidu
-                docker-compose up -d
+                export FOLLOW_OPENVIDU_LOGS=false
+                ./openvidu start
                 popd
               mode: "000755"
               owner: "root"
@@ -656,13 +657,8 @@ Resources:
 
             # Start openvidu application
             pushd /opt/openvidu
-            docker-compose up -d
-            if [[ ! -z "${ElasticsearchUrl}" ]]; then
-              docker-compose stop elasticsearch
-            fi
-            if [[ ! -z "${KibanaUrl}" ]]; then
-              docker-compose stop kibana
-            fi
+            export FOLLOW_OPENVIDU_LOGS=false
+            ./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 e4637a10..269323c5 100755
--- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu
+++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu
@@ -234,11 +234,13 @@ usage() {
     printf "\n"
 }
 
+[[ -z "${FOLLOW_OPENVIDU_LOGS}" ]] && FOLLOW_OPENVIDU_LOGS=true
+
 case $1 in
 
   start)
     start_openvidu
-    docker-compose logs -f openvidu-server
+    [[ "${FOLLOW_OPENVIDU_LOGS}" == "true" ]] && docker-compose logs -f openvidu-server
     ;;
 
   stop)
@@ -248,7 +250,7 @@ case $1 in
   restart)
     docker-compose down
     start_openvidu
-    docker-compose logs -f openvidu-server
+    [[ "${FOLLOW_OPENVIDU_LOGS}" == "true" ]] && docker-compose logs -f openvidu-server
     ;;
 
   logs)