diff --git a/internal/msggateway/ws_server.go b/internal/msggateway/ws_server.go index 43cb22be0..51021ab63 100644 --- a/internal/msggateway/ws_server.go +++ b/internal/msggateway/ws_server.go @@ -197,7 +197,6 @@ func (ws *WsServer) Run(done chan error) error { return errs.WrapMsg(sErr, "shutdown err") } close(shutdownDone) - fmt.Println("SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS") return nil } etcd.RegisterShutDown(shutDown) diff --git a/pkg/common/discovery/etcd/config_manager.go b/pkg/common/discovery/etcd/config_manager.go index c26771f9d..013e2cce3 100644 --- a/pkg/common/discovery/etcd/config_manager.go +++ b/pkg/common/discovery/etcd/config_manager.go @@ -2,7 +2,6 @@ package etcd import ( "context" - "fmt" "os" "os/exec" "runtime" @@ -95,12 +94,10 @@ func restartServer(ctx context.Context) error { } log.ZInfo(ctx, "shutdown server") for _, f := range ShutDowns { - log.ZInfo(ctx, "shutdown ffff") if err = f(); err != nil { log.ZError(ctx, "shutdown fail", err) } } - fmt.Println("HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH") log.ZInfo(ctx, "restart server") err = cmd.Start() diff --git a/pkg/common/startrpc/start.go b/pkg/common/startrpc/start.go index 4cc414603..5facc8f73 100644 --- a/pkg/common/startrpc/start.go +++ b/pkg/common/startrpc/start.go @@ -188,7 +188,7 @@ func Start[T any](ctx context.Context, discovery *conf.Discovery, prometheusConf go func() { err := srv.Serve(listener) - if err != nil { + if err != nil && !errors.Is(err, http.ErrServerClosed) { netErr = errs.WrapMsg(err, "rpc start err: ", rpcTcpAddr) netDone <- struct{}{} }