blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Optimizing Docker Log Output Detection (#2014)

Browse Source 
* Optimize script logs

* Optimizing Docker Log Output Detection

* Optimizing Docker Log Output Detection
This commit is contained in:
skiffer-git 2024-03-07 12:24:45 +08:00 committed by GitHub
parent 13d0883507
commit 38f685bd01
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 20 additions and 9 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"

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

@ -23,15 +23,7 @@
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"
openim::log::info "\n# Use Docker to start all openim service" openim::log::info "\n# Use Docker to start all openim service"
trap 'openim::util::onCtrlC' INT trap 'openim::util::onCtrlC' INT
"${OPENIM_ROOT}"/scripts/start-all.sh "${OPENIM_ROOT}"/scripts/start-all.sh
tail -f ${DOCKER_LOG_FILE}
sleep 5
"${OPENIM_ROOT}"/scripts/check-all.sh
tail -f ${LOG_FILE}

6
scripts/lib/logging.sh
View File

@ -36,6 +36,12 @@ if [[ ! -d "${OPENIM_OUTPUT}/logs" ]]; then
touch "$TMP_LOG_FILE" touch "$TMP_LOG_FILE"
fi fi
if [[ ! -f "$DOCKER_LOG_FILE" ]]; then
touch "$DOCKER_LOG_FILE"
fi
# Define the logging function # Define the logging function
function echo_log() { function echo_log() {
if $ENABLE_LOGGING; then if $ENABLE_LOGGING; then

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