From 35b667a083d9e42e8766ce474ded2a521d863aea Mon Sep 17 00:00:00 2001
From: cruizba <charlesrb94@outlook.com>
Date: Thu, 5 Nov 2020 12:59:22 +0100
Subject: [PATCH] openvidu-deployment: Same commands to access kms logs in CE
 and PRO. Same directory for kms logs

---
 .../ce/docker-compose/docker-compose.yml      |  2 ++
 .../deployments/ce/docker-compose/openvidu    | 21 ++++++++++++-
 .../pro/docker-compose/media-node/media_node  | 31 ++++++++++---------
 3 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/openvidu-server/deployments/ce/docker-compose/docker-compose.yml b/openvidu-server/deployments/ce/docker-compose/docker-compose.yml
index f62ef01c..545173c5 100644
--- a/openvidu-server/deployments/ce/docker-compose/docker-compose.yml
+++ b/openvidu-server/deployments/ce/docker-compose/docker-compose.yml
@@ -50,10 +50,12 @@ services:
         volumes:
             - /opt/openvidu/kms-crashes:/opt/openvidu/kms-crashes
             - ${OPENVIDU_RECORDING_PATH}:${OPENVIDU_RECORDING_PATH}
+            - /opt/openvidu/kurento-logs:/opt/openvidu/kurento-logs
         environment:
             - KMS_MIN_PORT=40000
             - KMS_MAX_PORT=57000
             - GST_DEBUG=${KMS_DOCKER_ENV_GST_DEBUG:-}
+            - KURENTO_LOGS_PATH=/opt/openvidu/kurento-logs
 
     redis:
         image: openvidu/openvidu-redis:1.0.0
diff --git a/openvidu-server/deployments/ce/docker-compose/openvidu b/openvidu-server/deployments/ce/docker-compose/openvidu
index 64a67c36..267365e0 100755
--- a/openvidu-server/deployments/ce/docker-compose/openvidu
+++ b/openvidu-server/deployments/ce/docker-compose/openvidu
@@ -190,6 +190,9 @@ usage() {
     printf "\n\tstop\t\t\tStop all services"
     printf "\n\trestart\t\t\tRestart all stoped and running services"
     printf "\n\tlogs\t\t\tShow openvidu-server logs"
+    printf "\n\tlogs [-f]\t\t\tFollow openvidu logs"
+    printf "\n\tkms-logs\t\t\tShow kms logs"
+    printf "\n\tkms-logs [-f]\t\t\tFollow kms logs"
     printf "\n\tupgrade\t\t\tUpgrade to the lastest Openvidu version"
     printf "\n\tupgrade [version]\tUpgrade to the specific Openvidu version"
     printf "\n\tversion\t\t\tShow version of Openvidu Server"
@@ -198,6 +201,11 @@ usage() {
     printf "\n"
 }
 
+tail_kurento_logs() {
+  TAIL_ARGUMENTS=$1
+  tail "${TAIL_ARGUMENTS}" /opt/openvidu/kurento-logs/*
+}
+
 case $1 in
   start)
     docker-compose up -d
@@ -215,7 +223,18 @@ case $1 in
     ;;
 
   logs)
-    docker-compose logs -f openvidu-server
+    case $2 in
+      "-f")
+        docker-compose logs -f openvidu-server
+        ;;
+      *)
+        docker-compose logs openvidu-server
+        ;;
+    esac
+    ;;
+
+  kms-logs)
+    tail_kurento_logs $2
     ;;
 
   upgrade)
diff --git a/openvidu-server/deployments/pro/docker-compose/media-node/media_node b/openvidu-server/deployments/pro/docker-compose/media-node/media_node
index 01ff2f26..5d61b466 100755
--- a/openvidu-server/deployments/pro/docker-compose/media-node/media_node
+++ b/openvidu-server/deployments/pro/docker-compose/media-node/media_node
@@ -29,11 +29,9 @@ stop_containers() {
   done
 }
 
-tail_latest_kurento_logs() {
-  LATEST_LOG_FILE=$(find /opt/openvidu/kurento-logs/* -printf '%T+ %p\n' | sort -r | head -1 | awk '{print $2}')
-  if [[ ! -z "${LATEST_LOG_FILE}" ]]; then
-    tail -f "${LATEST_LOG_FILE}"
-  fi
+tail_kurento_logs() {
+  TAIL_ARGUMENTS=$1
+  tail "${TAIL_ARGUMENTS}" /opt/openvidu/kurento-logs/*
 }
 
 upgrade_media_node() {
@@ -217,7 +215,9 @@ usage() {
     printf "\n\tstop\t\t\tStop media node service"
     printf "\n\trestart\t\t\tRestart media node service"
     printf "\n\tlogs\t\t\tShow media-node-controller logs."
-    printf "\n\tlogs [container_name]\t\t\tShow logs by container name."
+    printf "\n\tlogs [-f]\t\t\tFollow media-node-controller logs."
+    printf "\n\tkms-logs\t\t\tShow kms logs"
+    printf "\n\tkms-logs -f\t\t\tFollow kms logs"
     printf "\n\tupgrade\t\t\tUpgrade to the lastest Media Node version"
     printf "\n\tupgrade [version]\tUpgrade to the specific Media Node version"
     printf "\n\tversion\t\t\tShow version of Media Node"
@@ -247,16 +247,17 @@ case $1 in
 
   logs)
     case $2 in
-      kms)
-        tail_latest_kurento_logs
-      ;;
+      "-f")
+        docker-compose logs -f media-node-controller
+        ;;
       *)
-        if [[ -z "$2" ]]; then
-          docker-compose logs -f media-node-controller
-        else 
-          docker logs -f "$2"
-        fi
-      ;;
+        docker-compose logs media-node-controller
+        ;;
+    esac
+    ;;
+  
+  kms-logs)
+    tail_kurento_logs $2
     ;;
 
   upgrade)