diff --git a/internal/msgtransfer/init.go b/internal/msgtransfer/init.go index 239f77fab..abf20e677 100644 --- a/internal/msgtransfer/init.go +++ b/internal/msgtransfer/init.go @@ -21,10 +21,6 @@ import ( "github.com/OpenIMSDK/tools/errs" util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil" - "net/http" - "os" - "os/signal" - "syscall" "github.com/OpenIMSDK/tools/mw" "github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" @@ -38,6 +34,10 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" + "net/http" + "os" + "os/signal" + "syscall" ) type MsgTransfer struct { @@ -133,7 +133,7 @@ func (m *MsgTransfer) Start(prometheusPort int) error { } sigs := make(chan os.Signal, 1) - signal.Notify(sigs, syscall.SIGUSR1) + signal.Notify(sigs, syscall.SIGTERM) select { case <-sigs: util.SIGUSR1Exit() diff --git a/internal/tools/cron_task.go b/internal/tools/cron_task.go index 6a8dee833..decc1aa82 100644 --- a/internal/tools/cron_task.go +++ b/internal/tools/cron_task.go @@ -64,7 +64,7 @@ func StartTask() error { crontab.Start() sigs := make(chan os.Signal, 1) - signal.Notify(sigs, syscall.SIGUSR1) + signal.Notify(sigs, syscall.SIGTERM) <-sigs // stop crontab, Wait for the running task to exit. diff --git a/pkg/common/startrpc/start.go b/pkg/common/startrpc/start.go index 7c2027941..ec4dee6df 100644 --- a/pkg/common/startrpc/start.go +++ b/pkg/common/startrpc/start.go @@ -134,7 +134,7 @@ func Start( }() sigs := make(chan os.Signal, 1) - signal.Notify(sigs, syscall.SIGUSR1) + signal.Notify(sigs, syscall.SIGTERM) select { case <-sigs: util.SIGUSR1Exit() diff --git a/pkg/util/genutil/genutil.go b/pkg/util/genutil/genutil.go index ff000aaeb..8117d04b6 100644 --- a/pkg/util/genutil/genutil.go +++ b/pkg/util/genutil/genutil.go @@ -48,5 +48,5 @@ func ExitWithError(err error) { func SIGUSR1Exit() { progName := filepath.Base(os.Args[0]) - fmt.Printf("\n\n%s receive process terminal SIGUSR1 exit 0\n\n", progName) + fmt.Printf("\n\n%s receive process terminal SIGTERM exit 0\n\n", progName) }