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

fix: fix the scripts

Browse Source
This commit is contained in:
luhaoling 2024-02-20 19:29:26 +08:00
parent 9cea45bf96
commit 7fff4aeabe
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/check-all-by-signal.sh
View File

@ -29,7 +29,8 @@ source "${OPENIM_ROOT}/scripts/install/common.sh"
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"
. $(dirname ${BASH_SOURCE})/install/openim-msgtransfer.sh openim::msgtransfer::check_by_signal || ture . $(dirname ${BASH_SOURCE})/install/openim-msgtransfer.sh openim::msgtransfer::check_by_signal
openim::log::info "\n# to check all openim service、nnnnnnnnnnnnnn"
handle_error() { handle_error() {
echo "An error occurred. Printing ${STDERR_LOG_FILE} contents:" echo "An error occurred. Printing ${STDERR_LOG_FILE} contents:"
@ -40,11 +41,6 @@ trap handle_error ERR
echo "Check ports:" echo "Check ports:"
openim::util::check_ports_by_signal ${OPENIM_SERVER_PORT_LISTARIES[@]} openim::util::check_ports_by_signal ${OPENIM_SERVER_PORT_LISTARIES[@]}
if [[ $? -ne 0 ]]; then
openim::log::error "The service does not stop properly, there are still processes running, please check!"
else
openim::log::success "++++ All openim service ports stop successfully !"
fi
set -e set -e

9
scripts/install/openim-msgtransfer.sh
View File

@ -88,16 +88,18 @@ function openim::msgtransfer::check() {
} }
function openim::msgtransfer::check_by_signal() { function openim::msgtransfer::check_by_signal() {
PIDS=$(pgrep -f "${OPENIM_OUTPUT_HOSTBIN}/openim-msgtransfer") PIDS=$(pgrep -f "${OPENIM_OUTPUT_HOSTBIN}/openim-msgtransfer") || PIDS="0"
if [ "$PIDS" = "0" ]; then
return 0
fi
NUM_PROCESSES=$(echo "$PIDS" | wc -l | xargs) NUM_PROCESSES=$(echo "$PIDS" | wc -l | xargs)
echo "1111111111111"
if [ "$NUM_PROCESSES" -gt 0 ]; then if [ "$NUM_PROCESSES" -gt 0 ]; then
openim::log::error "Found $NUM_PROCESSES processes for $OPENIM_OUTPUT_HOSTBIN/openim-msgtransfer" openim::log::error "Found $NUM_PROCESSES processes for $OPENIM_OUTPUT_HOSTBIN/openim-msgtransfer"
for PID in $PIDS; do for PID in $PIDS; do
if [[ "$OSTYPE" == "linux-gnu"* ]]; then if [[ "$OSTYPE" == "linux-gnu"* ]]; then
echo -e "\033[31m$(ps -p $PID -o pid,cmd)\033[0m" echo -e "\033[31m$(ps -p $PID -o pid,cmd)\033[0m"
ps -p $PID -o pid,cmd
elif [[ "$OSTYPE" == "darwin"* ]]; then elif [[ "$OSTYPE" == "darwin"* ]]; then
echo -e "\033[31m$(ps -p $PID -o pid,comm)\033[0m" echo -e "\033[31m$(ps -p $PID -o pid,comm)\033[0m"
else else
@ -108,7 +110,6 @@ function openim::msgtransfer::check_by_signal() {
else else
openim::log::success "All openim-msgtransfer processes have been stopped properly." openim::log::success "All openim-msgtransfer processes have been stopped properly."
fi fi
echo "2222222222222"
return 0 return 0
} }

2
scripts/lib/util.sh
View File

@ -440,10 +440,8 @@ openim::util::check_ports_by_signal() {
# If any of the processes is not running, return a status of 1. # If any of the processes is not running, return a status of 1.
if [[ ${#not_started[@]} -ne 0 ]]; then if [[ ${#not_started[@]} -ne 0 ]]; then
openim::log::success "All specified processes are running." openim::log::success "All specified processes are running."
return 0
else else
openim::log::error "Have processes no stop." openim::log::error "Have processes no stop."
return 1
fi fi
} }