From 5fb5a1fc07a6063887ea45474b0bba6ac93f555f Mon Sep 17 00:00:00 2001 From: luhaoling <2198702716@qq.com> Date: Tue, 20 Feb 2024 16:56:02 +0800 Subject: [PATCH] fix: fix the script --- pkg/util/genutil/genutil.go | 2 +- scripts/install/openim-msgtransfer.sh | 32 --------------------------- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/pkg/util/genutil/genutil.go b/pkg/util/genutil/genutil.go index 837235f85..8b7f6394a 100644 --- a/pkg/util/genutil/genutil.go +++ b/pkg/util/genutil/genutil.go @@ -48,5 +48,5 @@ func ExitWithError(err error) { func SIGTERMExit() { progName := filepath.Base(os.Args[0]) - fmt.Fprintf(os.Stderr, "Warning %s receive process terminal SIGTERM exit 0", progName) + fmt.Fprintf(os.Stderr, "Warning %s receive process terminal SIGTERM exit 0\n", progName) } diff --git a/scripts/install/openim-msgtransfer.sh b/scripts/install/openim-msgtransfer.sh index 00d8303d6..500ba4107 100755 --- a/scripts/install/openim-msgtransfer.sh +++ b/scripts/install/openim-msgtransfer.sh @@ -108,38 +108,6 @@ function openim::msgtransfer::check_by_signal() { fi } -function openim::msgtransfer::check_by_signal() { - PIDS=$(pgrep -f "${OPENIM_OUTPUT_HOSTBIN}/openim-msgtransfer") - if [ -z "$PIDS" ]; then - openim::log::success "All openim-msgtransfer processes have been stopped properly." - return 0 - fi - - openim::log::error "Found processes for $OPENIM_OUTPUT_HOSTBIN/openim-msgtransfer:" - for PID in $PIDS; do - if [[ "$OSTYPE" == "linux-gnu"* ]]; then - # Extract details for Linux - details=$(ps -p $PID -o pid,comm,lstart= | awk 'NR>1 {print $1, $2, $3, $4, $5, $6, $7}') - command=$(echo $details | awk '{print $2}') - start_time=$(echo $details | awk '{print $3, $4, $5, $6, $7}') - elif [[ "$OSTYPE" == "darwin"* ]]; then - # Handle details extraction for macOS - details=$(ps -p $PID -o pid,comm,start= | awk 'NR>1 {print $1, $2, $3}') - command=$(echo $details | awk '{print $2}') - start_time=$(echo $details | awk '{print $3}') - else - openim::log::error "Unsupported OS type: $OSTYPE" - return 1 - fi - - # Assuming FD and port number are not directly retrievable for msgtransfer processes - openim::log::error "PID: $PID - Command: $command, Started: $start_time" - done - - openim::log::success "Processes have not been stopped properly." - return 1 -} - function openim::msgtransfer::check_by_signal1() { PIDS=$(pgrep -f "${OPENIM_OUTPUT_HOSTBIN}/openim-msgtransfer")