From aed9d2f5575aa0551153fdda9ad8a817e9a0946e Mon Sep 17 00:00:00 2001 From: Kristijan Mitrovic Date: Thu, 24 Sep 2020 12:35:35 +0200 Subject: [PATCH] Include postgres logs in log manager script --- .../packer/roles/bubble/files/log_manager.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/bubble-server/src/main/resources/packer/roles/bubble/files/log_manager.sh b/bubble-server/src/main/resources/packer/roles/bubble/files/log_manager.sh index 7003ed0f..183dc990 100755 --- a/bubble-server/src/main/resources/packer/roles/bubble/files/log_manager.sh +++ b/bubble-server/src/main/resources/packer/roles/bubble/files/log_manager.sh @@ -3,22 +3,34 @@ # Copyright (c) 2020 Bubble, Inc. All rights reserved. For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/ # BUBBLE_LOGS_FOLDER=/var/log/bubble +POSTGRES_LOGS_FOLDER=$(readlink -f "${BUBBLE_LOGS_FOLDER}"/postgresql) REDIS_LOG_FLAG_KEY="bubble.StandardSelfNodeService.bubble_server_logs_enabled" REDIS_LOG_FLAG_VALUE=$(echo "get ${REDIS_LOG_FLAG_KEY}" | redis-cli | xargs echo | tr '[:upper:]' '[:lower:]') if [[ ${REDIS_LOG_FLAG_VALUE} == true ]]; then is_reload_needed=false - for logFile in $(find "${BUBBLE_LOGS_FOLDER}"/* -type l); do + is_psql_restart_needed=false + # Cannot use -L option in find here as links are actually find's target: + for logFile in $(find "${BUBBLE_LOGS_FOLDER}"/* -type l ! -name postgresql); do rm "${logFile}" touch "${logFile}" is_reload_needed=true done + for psqlLogFile in $(find "${POSTGRES_LOGS_FOLDER}"/* -type l); do + rm "${psqlLogFile}" + is_psql_restart_needed=true + done + + if [[ ${is_psql_restart_needed} == true ]]; then + service postgresql restart + fi if [[ ${is_reload_needed} == true ]]; then supervisorctl reload fi else - for logFile in $(find "${BUBBLE_LOGS_FOLDER}"/* -type f); do + # following dir link with -L option, so no need for special postgres for loop in this case: + for logFile in $(find -L "${BUBBLE_LOGS_FOLDER}"/* -type f); do ln -sf /dev/null "${logFile}" done fi