From 5d61cb1afad7cf6793f19029ee74b5c33a10a2ea Mon Sep 17 00:00:00 2001 From: Juan Navarro Date: Mon, 6 Jun 2022 14:46:37 +0200 Subject: [PATCH 1/2] deployments: use "--tail 10" to follow logs docker-compose uses "--tail all" by default, which prints the complete logs before starting to follow new lines. This becomes a problem when the service has been running for a lot of time and there are thousand of lines. Use "--tail 10" to mimic the behavior of the "tail" program, which shows the latest 10 lines by default. --- openvidu-server/deployments/ce/docker-compose/openvidu | 6 +++--- openvidu-server/deployments/enterprise/master-node/openvidu | 6 +++--- .../deployments/pro/docker-compose/media-node/media_node | 6 +++--- .../pro/docker-compose/openvidu-server-pro/openvidu | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/openvidu-server/deployments/ce/docker-compose/openvidu b/openvidu-server/deployments/ce/docker-compose/openvidu index e0e1e4e3..73ff8b19 100755 --- a/openvidu-server/deployments/ce/docker-compose/openvidu +++ b/openvidu-server/deployments/ce/docker-compose/openvidu @@ -231,7 +231,7 @@ kurento_logs() { case $1 in start) docker-compose up -d - docker-compose logs -f openvidu-server + docker-compose logs -f --tail 10 openvidu-server ;; stop) @@ -241,13 +241,13 @@ case $1 in restart) docker-compose down docker-compose up -d - docker-compose logs -f openvidu-server + docker-compose logs -f --tail 10 openvidu-server ;; logs) case $2 in "-f") - docker-compose logs -f openvidu-server + docker-compose logs -f --tail 10 openvidu-server ;; *) docker-compose logs openvidu-server diff --git a/openvidu-server/deployments/enterprise/master-node/openvidu b/openvidu-server/deployments/enterprise/master-node/openvidu index 00ccf9cf..4405b198 100755 --- a/openvidu-server/deployments/enterprise/master-node/openvidu +++ b/openvidu-server/deployments/enterprise/master-node/openvidu @@ -237,7 +237,7 @@ case $1 in start) start_openvidu if [[ "${FOLLOW_OPENVIDU_LOGS}" == "true" ]]; then - docker-compose logs -f openvidu-server + docker-compose logs -f --tail 10 openvidu-server fi ;; @@ -249,12 +249,12 @@ case $1 in docker-compose down start_openvidu if [[ "${FOLLOW_OPENVIDU_LOGS}" == "true" ]]; then - docker-compose logs -f openvidu-server + docker-compose logs -f --tail 10 openvidu-server fi ;; logs) - docker-compose logs -f openvidu-server + docker-compose logs -f --tail 10 openvidu-server ;; 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 7bef7d9b..3ebfb303 100755 --- a/openvidu-server/deployments/pro/docker-compose/media-node/media_node +++ b/openvidu-server/deployments/pro/docker-compose/media-node/media_node @@ -243,7 +243,7 @@ case $1 in start) docker-compose up -d - docker-compose logs -f media-node-controller + docker-compose logs -f --tail 10 media-node-controller ;; stop) @@ -255,13 +255,13 @@ case $1 in docker-compose down stop_containers docker-compose up -d - docker-compose logs -f media-node-controller + docker-compose logs -f --tail 10 media-node-controller ;; logs) case $2 in "-f") - docker-compose logs -f media-node-controller + docker-compose logs -f --tail 10 media-node-controller ;; *) docker-compose logs media-node-controller 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 61efb86a..541f40f0 100755 --- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu +++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu @@ -257,7 +257,7 @@ case $1 in start) start_openvidu if [[ "${FOLLOW_OPENVIDU_LOGS}" == "true" ]]; then - docker-compose logs -f openvidu-server + docker-compose logs -f --tail 10 openvidu-server fi ;; @@ -269,12 +269,12 @@ case $1 in docker-compose down start_openvidu if [[ "${FOLLOW_OPENVIDU_LOGS}" == "true" ]]; then - docker-compose logs -f openvidu-server + docker-compose logs -f --tail 10 openvidu-server fi ;; logs) - docker-compose logs -f openvidu-server + docker-compose logs -f --tail 10 openvidu-server ;; upgrade) From 4e54cd24723e7fc74eca0911c9dbc7d028707466 Mon Sep 17 00:00:00 2001 From: Juan Navarro Date: Mon, 6 Jun 2022 14:54:43 +0200 Subject: [PATCH 2/2] deployments: Allow users to print whole logs or just follow them Users can call the script with "-f" or "--follow" in order to follow the latest lines (like with system tool "tail -f"), of not provide this argument to obtain the whole contents of the logs. --- openvidu-server/deployments/ce/docker-compose/openvidu | 4 ++-- .../deployments/enterprise/master-node/openvidu | 9 ++++++++- .../deployments/pro/docker-compose/media-node/media_node | 4 ++-- .../pro/docker-compose/openvidu-server-pro/openvidu | 9 ++++++++- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/openvidu-server/deployments/ce/docker-compose/openvidu b/openvidu-server/deployments/ce/docker-compose/openvidu index 73ff8b19..6e7ec91d 100755 --- a/openvidu-server/deployments/ce/docker-compose/openvidu +++ b/openvidu-server/deployments/ce/docker-compose/openvidu @@ -245,8 +245,8 @@ case $1 in ;; logs) - case $2 in - "-f") + case "${2-}" in + --follow|-f) docker-compose logs -f --tail 10 openvidu-server ;; *) diff --git a/openvidu-server/deployments/enterprise/master-node/openvidu b/openvidu-server/deployments/enterprise/master-node/openvidu index 4405b198..55a2bd96 100755 --- a/openvidu-server/deployments/enterprise/master-node/openvidu +++ b/openvidu-server/deployments/enterprise/master-node/openvidu @@ -254,7 +254,14 @@ case $1 in ;; logs) - docker-compose logs -f --tail 10 openvidu-server + case "${2-}" in + --follow|-f) + docker-compose logs -f --tail 10 openvidu-server + ;; + *) + docker-compose logs openvidu-server + ;; + esac ;; 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 3ebfb303..0f3dc728 100755 --- a/openvidu-server/deployments/pro/docker-compose/media-node/media_node +++ b/openvidu-server/deployments/pro/docker-compose/media-node/media_node @@ -259,8 +259,8 @@ case $1 in ;; logs) - case $2 in - "-f") + case "${2-}" in + --follow|-f) docker-compose logs -f --tail 10 media-node-controller ;; *) 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 541f40f0..0939779d 100755 --- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu +++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/openvidu @@ -274,7 +274,14 @@ case $1 in ;; logs) - docker-compose logs -f --tail 10 openvidu-server + case "${2-}" in + --follow|-f) + docker-compose logs -f --tail 10 openvidu-server + ;; + *) + docker-compose logs openvidu-server + ;; + esac ;; upgrade)