blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-12-03 02:42:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Optimize script logs

Browse Source
This commit is contained in:
skiffer-git 2024-03-07 10:54:47 +08:00
parent 13d0883507
commit d09eccd117
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/check-all.sh
View File

@ -26,6 +26,11 @@
OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${OPENIM_ROOT}/scripts/install/common.sh" source "${OPENIM_ROOT}/scripts/install/common.sh"
if grep -q docker /proc/1/cgroup; then
exec > ${DOCKER_LOG_FILE} 2>&1
fi
OPENIM_VERBOSE=4 OPENIM_VERBOSE=4
openim::log::info "\n# Begin to check all openim service" openim::log::info "\n# Begin to check all openim service"

6
scripts/docker-start-all.sh
View File

@ -30,8 +30,4 @@ trap 'openim::util::onCtrlC' INT
"${OPENIM_ROOT}"/scripts/start-all.sh "${OPENIM_ROOT}"/scripts/start-all.sh
sleep 5 tail -f ${DOCKER_LOG_FILE}
"${OPENIM_ROOT}"/scripts/check-all.sh
tail -f ${LOG_FILE}

2
scripts/lib/logging.sh
View File

@ -28,12 +28,14 @@ fi
LOG_FILE="${OPENIM_OUTPUT}/logs/openim-$(date '+%Y%m%d').log" LOG_FILE="${OPENIM_OUTPUT}/logs/openim-$(date '+%Y%m%d').log"
STDERR_LOG_FILE="${OPENIM_OUTPUT}/logs/openim-error-$(date '+%Y%m%d').log" STDERR_LOG_FILE="${OPENIM_OUTPUT}/logs/openim-error-$(date '+%Y%m%d').log"
TMP_LOG_FILE="${OPENIM_OUTPUT}/logs/openim-tmp-$(date '+%Y%m%d').log" TMP_LOG_FILE="${OPENIM_OUTPUT}/logs/openim-tmp-$(date '+%Y%m%d').log"
DOCKER_LOG_FILE="${OPENIM_OUTPUT}/logs/openim-docker-$(date '+%Y%m%d').log"
if [[ ! -d "${OPENIM_OUTPUT}/logs" ]]; then if [[ ! -d "${OPENIM_OUTPUT}/logs" ]]; then
mkdir -p "${OPENIM_OUTPUT}/logs" mkdir -p "${OPENIM_OUTPUT}/logs"
touch "$LOG_FILE" touch "$LOG_FILE"
touch "$STDERR_LOG_FILE" touch "$STDERR_LOG_FILE"
touch "$TMP_LOG_FILE" touch "$TMP_LOG_FILE"
touch "$DOCKER_LOG_FILE"
fi fi
# Define the logging function # Define the logging function

8
scripts/start-all.sh
View File

@ -17,12 +17,17 @@
#FIXME The full names of the shell scripts that need to be started are placed in the `need_to_start_server_shell` array. #FIXME The full names of the shell scripts that need to be started are placed in the `need_to_start_server_shell` array.
#!/bin/bash
OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. OPENIM_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${OPENIM_ROOT}/scripts/install/common.sh" source "${OPENIM_ROOT}/scripts/install/common.sh"
# Function to execute the scripts. # Function to execute the scripts.
function execute_start_scripts() { function execute_start_scripts() {
for script_path in "${OPENIM_SERVER_SCRIPT_START_LIST[@]}"; do for script_path in "${OPENIM_SERVER_SCRIPT_START_LIST[@]}"; do
@ -57,6 +62,9 @@ function execute_start_scripts() {
if grep -q docker /proc/1/cgroup; then
exec > ${DOCKER_LOG_FILE} 2>&1
fi