From f3b27abc4312c0cb86ae70cc631f46bb154c29d1 Mon Sep 17 00:00:00 2001 From: luhaoling <2198702716@qq.com> Date: Thu, 22 Feb 2024 22:03:00 +0800 Subject: [PATCH] fix: fi the code error --- cmd/openim-api/main.go | 2 +- internal/msgtransfer/init.go | 2 +- pkg/common/startrpc/start.go | 2 +- pkg/util/genutil/genutil.go | 4 ++-- scripts/install/openim-msggateway.sh | 1 - scripts/install/openim-msgtransfer.sh | 1 - 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/cmd/openim-api/main.go b/cmd/openim-api/main.go index 7a7e06293..34ada1d57 100644 --- a/cmd/openim-api/main.go +++ b/cmd/openim-api/main.go @@ -119,7 +119,7 @@ func run(port int, proPort int) error { defer cancel() select { case <-sigs: - util.SIGUSR1Exit() + util.SIGTERMExit() err := server.Shutdown(ctx) if err != nil { return errs.Wrap(err, "shutdown err") diff --git a/internal/msgtransfer/init.go b/internal/msgtransfer/init.go index 16d8613db..ac545f198 100644 --- a/internal/msgtransfer/init.go +++ b/internal/msgtransfer/init.go @@ -144,7 +144,7 @@ func (m *MsgTransfer) Start(prometheusPort int) error { signal.Notify(sigs, syscall.SIGTERM) select { case <-sigs: - util.SIGUSR1Exit() + util.SIGTERMExit() // graceful close kafka client. m.cancel() m.historyCH.historyConsumerGroup.Close() diff --git a/pkg/common/startrpc/start.go b/pkg/common/startrpc/start.go index 6bcdcca5d..be9fbd25b 100644 --- a/pkg/common/startrpc/start.go +++ b/pkg/common/startrpc/start.go @@ -140,7 +140,7 @@ func Start( signal.Notify(sigs, syscall.SIGTERM) select { case <-sigs: - util.SIGUSR1Exit() + util.SIGTERMExit() ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second) defer cancel() if err := gracefulStopWithCtx(ctx, srv.GracefulStop); err != nil { diff --git a/pkg/util/genutil/genutil.go b/pkg/util/genutil/genutil.go index 70709be57..bd9376d58 100644 --- a/pkg/util/genutil/genutil.go +++ b/pkg/util/genutil/genutil.go @@ -46,7 +46,7 @@ func ExitWithError(err error) { os.Exit(-1) } -func SIGUSR1Exit() { +func SIGTERMExit() { progName := filepath.Base(os.Args[0]) - fmt.Printf("\n\n%s receive process terminal SIGTERM exit 0\n\n", progName) + fmt.Fprintf(os.Stderr, "Warning %s receive process terminal SIGTERM exit 0\n", progName) } diff --git a/scripts/install/openim-msggateway.sh b/scripts/install/openim-msggateway.sh index 151538101..3eb9bb349 100755 --- a/scripts/install/openim-msggateway.sh +++ b/scripts/install/openim-msggateway.sh @@ -21,7 +21,6 @@ OPENIM_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")"/../.. && pwd -P) [[ -z ${COMMON_SOURCED} ]] && source "${OPENIM_ROOT}"/scripts/install/common.sh -openim::util::set_max_fd 200000 SERVER_NAME="openim-msggateway" diff --git a/scripts/install/openim-msgtransfer.sh b/scripts/install/openim-msgtransfer.sh index 4abf9b5e2..d18f6a77c 100755 --- a/scripts/install/openim-msgtransfer.sh +++ b/scripts/install/openim-msgtransfer.sh @@ -23,7 +23,6 @@ OPENIM_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")"/../.. && pwd -P) [[ -z ${COMMON_SOURCED} ]] && source "${OPENIM_ROOT}"/scripts/install/common.sh -openim::util::set_max_fd 200000 SERVER_NAME="openim-msgtransfer"